From 90546f634cc4e510185e20a4d1ba1c74ebc59b85 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] 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 --- .eslintignore | 6 ++--- protos/google/pubsub/v1/pubsub.proto | 4 +++ protos/protos.d.ts | 6 +++++ protos/protos.js | 37 ++++++++++++++++++++++++++++ protos/protos.json | 7 ++++++ 5 files changed, 56 insertions(+), 4 deletions(-) diff --git a/.eslintignore b/.eslintignore index a5e47c7e7..cfc348ec4 100644 --- a/.eslintignore +++ b/.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/protos/google/pubsub/v1/pubsub.proto b/protos/google/pubsub/v1/pubsub.proto index b70bda11a..b5092087a 100644 --- a/protos/google/pubsub/v1/pubsub.proto +++ b/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/protos/protos.d.ts b/protos/protos.d.ts index 19956f26c..69f782b8d 100644 --- a/protos/protos.d.ts +++ b/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/protos/protos.js b/protos/protos.js index b439f7b68..5b9a057d5 100644 --- a/protos/protos.js +++ b/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/protos/protos.json b/protos/protos.json index 6497622c4..70e570e04 100644 --- a/protos/protos.json +++ b/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,