From 804ff5b397e8e29f6a68113d2b515756e31eaada Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Thu, 23 Apr 2026 21:22:52 +0000 Subject: [PATCH 1/3] Try modifying the tests for new dependency --- handwritten/bigquery-storage/package.json | 2 +- .../bigquery-storage/system-test/managed_writer_client_test.ts | 3 ++- handwritten/bigquery-storage/system-test/reader_client_test.ts | 1 + handwritten/bigquery-storage/test/adapt/proto.ts | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/handwritten/bigquery-storage/package.json b/handwritten/bigquery-storage/package.json index 26fbe1745c5d..da8c9d26bc63 100644 --- a/handwritten/bigquery-storage/package.json +++ b/handwritten/bigquery-storage/package.json @@ -41,7 +41,7 @@ "long": "^5.2.0" }, "peerDependencies": { - "protobufjs": "7.2.4 - 7.5.0" + "protobufjs": "7.2.4 - 7.5.5" }, "devDependencies": { "@google-cloud/bigquery": "^8.0.0", diff --git a/handwritten/bigquery-storage/system-test/managed_writer_client_test.ts b/handwritten/bigquery-storage/system-test/managed_writer_client_test.ts index a2c80746db1f..a9fc27e963c7 100644 --- a/handwritten/bigquery-storage/system-test/managed_writer_client_test.ts +++ b/handwritten/bigquery-storage/system-test/managed_writer_client_test.ts @@ -23,6 +23,7 @@ import {BigQuery, TableSchema} from '@google-cloud/bigquery'; import * as protos from '../protos/protos'; import * as bigquerywriter from '../src'; import * as protobuf from 'protobufjs'; +import 'protobufjs/ext/descriptor'; import {ClientOptions} from 'google-gax'; import * as customerRecordProtoJson from './fixtures/customer_record.json'; import {JSONEncoder} from '../src/managedwriter/encoder'; @@ -1863,7 +1864,7 @@ describe('managedwriter.WriterClient', () => { assert.equal(reconnectedCalled, false); // add a fake pending write - connection['_pendingWrites'].push(new PendingWrite({})); + connection['_pendingWrites'].push(new PendingWrite({writeStream: parent})); conn.emit('error', gerr); conn.emit('close'); diff --git a/handwritten/bigquery-storage/system-test/reader_client_test.ts b/handwritten/bigquery-storage/system-test/reader_client_test.ts index 6949d4a07d83..aeb478fadf5c 100644 --- a/handwritten/bigquery-storage/system-test/reader_client_test.ts +++ b/handwritten/bigquery-storage/system-test/reader_client_test.ts @@ -20,6 +20,7 @@ import * as sinon from 'sinon'; import {BigQuery, TableRow, TableSchema} from '@google-cloud/bigquery'; import * as protos from '../protos/protos'; import * as protobuf from 'protobufjs'; +import 'protobufjs/ext/descriptor'; import {ClientOptions} from 'google-gax'; import * as customerRecordProtoJson from './fixtures/customer_record.json'; import * as bigquerystorage from '../src'; diff --git a/handwritten/bigquery-storage/test/adapt/proto.ts b/handwritten/bigquery-storage/test/adapt/proto.ts index 3a871624c562..b062013bf002 100644 --- a/handwritten/bigquery-storage/test/adapt/proto.ts +++ b/handwritten/bigquery-storage/test/adapt/proto.ts @@ -15,6 +15,7 @@ import * as assert from 'assert'; import {describe, it} from 'mocha'; import * as protobuf from 'protobufjs'; +import 'protobufjs/ext/descriptor'; import * as adapt from '../../src/adapt'; import * as messagesJSON from '../testdata/message.json'; import * as protos from '../../protos/protos'; From 8651e9e39ef0511501db87e1c5b3252d8fc759d8 Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Fri, 24 Apr 2026 10:07:13 -0400 Subject: [PATCH 2/3] Get rid of the protobufjs/ext/descriptor strings --- handwritten/bigquery-storage/package.json | 2 +- .../bigquery-storage/system-test/managed_writer_client_test.ts | 1 - handwritten/bigquery-storage/system-test/reader_client_test.ts | 1 - handwritten/bigquery-storage/test/adapt/proto.ts | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/handwritten/bigquery-storage/package.json b/handwritten/bigquery-storage/package.json index da8c9d26bc63..4cff498f1ae9 100644 --- a/handwritten/bigquery-storage/package.json +++ b/handwritten/bigquery-storage/package.json @@ -41,7 +41,7 @@ "long": "^5.2.0" }, "peerDependencies": { - "protobufjs": "7.2.4 - 7.5.5" + "protobufjs": "^7.5.5" }, "devDependencies": { "@google-cloud/bigquery": "^8.0.0", diff --git a/handwritten/bigquery-storage/system-test/managed_writer_client_test.ts b/handwritten/bigquery-storage/system-test/managed_writer_client_test.ts index a9fc27e963c7..d98e40bade6d 100644 --- a/handwritten/bigquery-storage/system-test/managed_writer_client_test.ts +++ b/handwritten/bigquery-storage/system-test/managed_writer_client_test.ts @@ -23,7 +23,6 @@ import {BigQuery, TableSchema} from '@google-cloud/bigquery'; import * as protos from '../protos/protos'; import * as bigquerywriter from '../src'; import * as protobuf from 'protobufjs'; -import 'protobufjs/ext/descriptor'; import {ClientOptions} from 'google-gax'; import * as customerRecordProtoJson from './fixtures/customer_record.json'; import {JSONEncoder} from '../src/managedwriter/encoder'; diff --git a/handwritten/bigquery-storage/system-test/reader_client_test.ts b/handwritten/bigquery-storage/system-test/reader_client_test.ts index aeb478fadf5c..6949d4a07d83 100644 --- a/handwritten/bigquery-storage/system-test/reader_client_test.ts +++ b/handwritten/bigquery-storage/system-test/reader_client_test.ts @@ -20,7 +20,6 @@ import * as sinon from 'sinon'; import {BigQuery, TableRow, TableSchema} from '@google-cloud/bigquery'; import * as protos from '../protos/protos'; import * as protobuf from 'protobufjs'; -import 'protobufjs/ext/descriptor'; import {ClientOptions} from 'google-gax'; import * as customerRecordProtoJson from './fixtures/customer_record.json'; import * as bigquerystorage from '../src'; diff --git a/handwritten/bigquery-storage/test/adapt/proto.ts b/handwritten/bigquery-storage/test/adapt/proto.ts index b062013bf002..3a871624c562 100644 --- a/handwritten/bigquery-storage/test/adapt/proto.ts +++ b/handwritten/bigquery-storage/test/adapt/proto.ts @@ -15,7 +15,6 @@ import * as assert from 'assert'; import {describe, it} from 'mocha'; import * as protobuf from 'protobufjs'; -import 'protobufjs/ext/descriptor'; import * as adapt from '../../src/adapt'; import * as messagesJSON from '../testdata/message.json'; import * as protos from '../../protos/protos'; From 9deb96df11eee8f65fb8f2999a91c4db3e17f516 Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Fri, 24 Apr 2026 10:14:02 -0400 Subject: [PATCH 3/3] revert pending write change --- .../bigquery-storage/system-test/managed_writer_client_test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/handwritten/bigquery-storage/system-test/managed_writer_client_test.ts b/handwritten/bigquery-storage/system-test/managed_writer_client_test.ts index d98e40bade6d..3eba4187510e 100644 --- a/handwritten/bigquery-storage/system-test/managed_writer_client_test.ts +++ b/handwritten/bigquery-storage/system-test/managed_writer_client_test.ts @@ -1863,7 +1863,8 @@ describe('managedwriter.WriterClient', () => { assert.equal(reconnectedCalled, false); // add a fake pending write - connection['_pendingWrites'].push(new PendingWrite({writeStream: parent})); + connection['_pendingWrites'].push(new PendingWrite({})); + // connection['_pendingWrites'].push(new PendingWrite({writeStream: parent})); conn.emit('error', gerr); conn.emit('close');