diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index d8afdb11a359..447c4d7e6e8c 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -20,7 +20,7 @@ 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, LoggingFunction} from './logs'; /** * Loggers. Exported for unit tests. @@ -28,10 +28,10 @@ import {logs as baseLogs} from './logs'; * @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'), + 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 b6c9aa68f68c..dadddcf60bee 100644 --- a/handwritten/pubsub/src/logs.ts +++ b/handwritten/pubsub/src/logs.ts @@ -14,11 +14,13 @@ import {loggingUtils} from 'google-gax'; +export type LoggingFunction = loggingUtils.AdhocDebugLogFunction; + /** * Base logger. Other loggers will derive from this one. * * @private */ export const logs = { - pubsub: loggingUtils.log('pubsub'), + pubsub: loggingUtils.log('pubsub') as LoggingFunction, }; diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 3b4600c7ddf2..bdc10ecb740d 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -34,7 +34,7 @@ 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, LoggingFunction} from './logs'; /** * Loggers. Exported for unit tests. @@ -42,7 +42,7 @@ import {logs as baseLogs} from './logs'; * @private */ export const logs = { - ackBatch: baseLogs.pubsub.sublog('ack-batch'), + 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 60c404bcb853..35c8868b3528 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -26,7 +26,7 @@ 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, LoggingFunction} from './logs'; /** * Loggers. Exported for unit tests. @@ -34,7 +34,7 @@ import {logs as baseLogs} from './logs'; * @private */ export const logs = { - subscriberStreams: baseLogs.pubsub.sublog('subscriber-streams'), + 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 7f333a5c3307..0227e585cecd 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -24,7 +24,7 @@ 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, LoggingFunction} from '../logs'; /** * Loggers. Exported for unit tests. @@ -32,7 +32,7 @@ import {logs as baseLogs} from '../logs'; * @private */ export const logs = { - publishBatch: baseLogs.pubsub.sublog('publish-batch'), + publishBatch: baseLogs.pubsub.sublog('publish-batch') as LoggingFunction, }; /** 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..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} from './logs'; +import {logs as baseLogs, LoggingFunction} from './logs'; export {StatusError} from './message-stream'; @@ -42,9 +42,9 @@ export {StatusError} from './message-stream'; * @private */ export const logs = { - slowAck: baseLogs.pubsub.sublog('slow-ack'), - ackNack: baseLogs.pubsub.sublog('ack-nack'), - debug: baseLogs.pubsub.sublog('debug'), + 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;