From 91811a3aed003b6799ddf1c432c194a6465a02c7 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Mon, 8 Jun 2026 12:33:15 -0400 Subject: [PATCH 1/2] build: bring over build fixes from the samples PR --- handwritten/pubsub/src/lease-manager.ts | 4 ++-- handwritten/pubsub/src/logs.ts | 5 ++++- handwritten/pubsub/src/message-queues.ts | 4 ++-- handwritten/pubsub/src/message-stream.ts | 4 ++-- handwritten/pubsub/src/publisher/message-queues.ts | 4 ++-- handwritten/pubsub/src/pubsub.ts | 4 ++-- handwritten/pubsub/src/subscriber.ts | 4 ++-- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index d8afdb11a359..aa10d117b352 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -20,14 +20,14 @@ 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'; +import {logs as baseLogs, Loggers} from './logs'; /** * Loggers. Exported for unit tests. * * @private */ -export const logs = { +export const logs: Loggers = { callbackDelivery: baseLogs.pubsub.sublog('callback-delivery'), callbackExceptions: baseLogs.pubsub.sublog('callback-exceptions'), expiry: baseLogs.pubsub.sublog('expiry'), diff --git a/handwritten/pubsub/src/logs.ts b/handwritten/pubsub/src/logs.ts index b6c9aa68f68c..e3fa5c3841e7 100644 --- a/handwritten/pubsub/src/logs.ts +++ b/handwritten/pubsub/src/logs.ts @@ -14,11 +14,14 @@ import {loggingUtils} from 'google-gax'; +export type LoggingFunction = loggingUtils.AdhocDebugLogFunction; +export type Loggers = Record; + /** * Base logger. Other loggers will derive from this one. * * @private */ -export const logs = { +export const logs: Loggers = { pubsub: loggingUtils.log('pubsub'), }; diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 3b4600c7ddf2..6979e1543011 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -34,14 +34,14 @@ import {Duration} from './temporal'; import {addToBucket} from './util'; import {DebugMessage} from './debug'; import * as tracing from './telemetry-tracing'; -import {logs as baseLogs} from './logs'; +import {logs as baseLogs, Loggers} from './logs'; /** * Loggers. Exported for unit tests. * * @private */ -export const logs = { +export const logs: Loggers = { ackBatch: baseLogs.pubsub.sublog('ack-batch'), }; diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 60c404bcb853..e48e1dc0e673 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -26,14 +26,14 @@ import {defaultOptions} from './default-options'; import {Duration} from './temporal'; import {ExponentialRetry} from './exponential-retry'; import {DebugMessage} from './debug'; -import {logs as baseLogs} from './logs'; +import {logs as baseLogs, Loggers} from './logs'; /** * Loggers. Exported for unit tests. * * @private */ -export const logs = { +export const logs: Loggers = { subscriberStreams: baseLogs.pubsub.sublog('subscriber-streams'), }; diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index 7f333a5c3307..34c0a99d2963 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -24,14 +24,14 @@ 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'; +import {logs as baseLogs, Loggers} from '../logs'; /** * Loggers. Exported for unit tests. * * @private */ -export const logs = { +export const logs: Loggers = { publishBatch: baseLogs.pubsub.sublog('publish-batch'), }; diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index c250d9da665d..e9c9fc7bdf1e 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -17,7 +17,7 @@ import {paginator} from '@google-cloud/paginator'; import {replaceProjectIdToken} from '@google-cloud/projectify'; import * as extend from 'extend'; -import {GoogleAuth} from 'google-auth-library'; +import {AuthClient, GoogleAuth, GoogleAuthOptions} from 'google-auth-library'; import * as gax from 'google-gax'; // eslint-disable-next-line @typescript-eslint/no-var-requires @@ -335,7 +335,7 @@ export class PubSub { this.isEmulator = false; this.determineBaseUrl_(); this.api = {}; - this.auth = new GoogleAuth(this.options); + this.auth = new GoogleAuth(this.options as GoogleAuthOptions); this.projectId = this.options.projectId || PROJECT_ID_PLACEHOLDER; if (this.projectId !== PROJECT_ID_PLACEHOLDER) { this.name = PubSub.formatName_(this.projectId); diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 46834636e1b7..e30285c942ac 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -32,7 +32,7 @@ import {Duration, atMost as durationAtMost} from './temporal'; import {EventEmitter} from 'events'; import {awaitWithTimeout} from './util'; -import {logs as baseLogs} from './logs'; +import {logs as baseLogs, Loggers} from './logs'; export {StatusError} from './message-stream'; @@ -41,7 +41,7 @@ export {StatusError} from './message-stream'; * * @private */ -export const logs = { +export const logs: Loggers = { slowAck: baseLogs.pubsub.sublog('slow-ack'), ackNack: baseLogs.pubsub.sublog('ack-nack'), debug: baseLogs.pubsub.sublog('debug'), From 644c20f77e4a7d036c09fbf4a8cd236385660d8f Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Mon, 8 Jun 2026 13:02:41 -0400 Subject: [PATCH 2/2] chore: partially implement Gemini suggestions --- handwritten/pubsub/src/lease-manager.ts | 12 ++++++------ handwritten/pubsub/src/logs.ts | 5 ++--- handwritten/pubsub/src/message-queues.ts | 6 +++--- handwritten/pubsub/src/message-stream.ts | 6 +++--- handwritten/pubsub/src/publisher/message-queues.ts | 6 +++--- handwritten/pubsub/src/subscriber.ts | 10 +++++----- 6 files changed, 22 insertions(+), 23 deletions(-) diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index aa10d117b352..447c4d7e6e8c 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -20,18 +20,18 @@ import {AckError, Message, Subscriber} from './subscriber'; import {defaultOptions} from './default-options'; import {Duration} from './temporal'; import {DebugMessage} from './debug'; -import {logs as baseLogs, Loggers} from './logs'; +import {logs as baseLogs, LoggingFunction} from './logs'; /** * Loggers. Exported for unit tests. * * @private */ -export const logs: Loggers = { - 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 const logs = { + callbackDelivery: baseLogs.pubsub.sublog('callback-delivery') as LoggingFunction, + callbackExceptions: baseLogs.pubsub.sublog('callback-exceptions') as LoggingFunction, + expiry: baseLogs.pubsub.sublog('expiry') as LoggingFunction, + subscriberFlowControl: baseLogs.pubsub.sublog('subscriber-flow-control') as LoggingFunction, }; export interface FlowControlOptions { diff --git a/handwritten/pubsub/src/logs.ts b/handwritten/pubsub/src/logs.ts index e3fa5c3841e7..dadddcf60bee 100644 --- a/handwritten/pubsub/src/logs.ts +++ b/handwritten/pubsub/src/logs.ts @@ -15,13 +15,12 @@ import {loggingUtils} from 'google-gax'; export type LoggingFunction = loggingUtils.AdhocDebugLogFunction; -export type Loggers = Record; /** * Base logger. Other loggers will derive from this one. * * @private */ -export const logs: Loggers = { - pubsub: loggingUtils.log('pubsub'), +export const logs = { + pubsub: loggingUtils.log('pubsub') as LoggingFunction, }; diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 6979e1543011..bdc10ecb740d 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -34,15 +34,15 @@ import {Duration} from './temporal'; import {addToBucket} from './util'; import {DebugMessage} from './debug'; import * as tracing from './telemetry-tracing'; -import {logs as baseLogs, Loggers} from './logs'; +import {logs as baseLogs, LoggingFunction} from './logs'; /** * Loggers. Exported for unit tests. * * @private */ -export const logs: Loggers = { - ackBatch: baseLogs.pubsub.sublog('ack-batch'), +export const logs = { + ackBatch: baseLogs.pubsub.sublog('ack-batch') as LoggingFunction, }; export interface ReducedMessage { diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index e48e1dc0e673..35c8868b3528 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -26,15 +26,15 @@ import {defaultOptions} from './default-options'; import {Duration} from './temporal'; import {ExponentialRetry} from './exponential-retry'; import {DebugMessage} from './debug'; -import {logs as baseLogs, Loggers} from './logs'; +import {logs as baseLogs, LoggingFunction} from './logs'; /** * Loggers. Exported for unit tests. * * @private */ -export const logs: Loggers = { - subscriberStreams: baseLogs.pubsub.sublog('subscriber-streams'), +export const logs = { + subscriberStreams: baseLogs.pubsub.sublog('subscriber-streams') as LoggingFunction, }; /*! diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index 34c0a99d2963..0227e585cecd 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -24,15 +24,15 @@ import {google} from '../../protos/protos'; import * as tracing from '../telemetry-tracing'; import {filterMessage} from './pubsub-message'; import {promisify} from 'util'; -import {logs as baseLogs, Loggers} from '../logs'; +import {logs as baseLogs, LoggingFunction} from '../logs'; /** * Loggers. Exported for unit tests. * * @private */ -export const logs: Loggers = { - publishBatch: baseLogs.pubsub.sublog('publish-batch'), +export const logs = { + publishBatch: baseLogs.pubsub.sublog('publish-batch') as LoggingFunction, }; /** diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index e30285c942ac..8332e93c819d 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -32,7 +32,7 @@ import {Duration, atMost as durationAtMost} from './temporal'; import {EventEmitter} from 'events'; import {awaitWithTimeout} from './util'; -import {logs as baseLogs, Loggers} from './logs'; +import {logs as baseLogs, LoggingFunction} from './logs'; export {StatusError} from './message-stream'; @@ -41,10 +41,10 @@ export {StatusError} from './message-stream'; * * @private */ -export const logs: Loggers = { - slowAck: baseLogs.pubsub.sublog('slow-ack'), - ackNack: baseLogs.pubsub.sublog('ack-nack'), - debug: baseLogs.pubsub.sublog('debug'), +export const logs = { + slowAck: baseLogs.pubsub.sublog('slow-ack') as LoggingFunction, + ackNack: baseLogs.pubsub.sublog('ack-nack') as LoggingFunction, + debug: baseLogs.pubsub.sublog('debug') as LoggingFunction, }; export type PullResponse = google.pubsub.v1.IStreamingPullResponse;