build(pubsub): bring over build fixes from the samples PR

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} from './logs';
+import {logs as baseLogs, LoggingFunction} 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'),
+  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 {

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,
 };

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} from './logs';
+import {logs as baseLogs, LoggingFunction} from './logs';
 
 /**
  * Loggers. Exported for unit tests.
  *
  * @private
  */
 export const logs = {
-  ackBatch: baseLogs.pubsub.sublog('ack-batch'),
+  ackBatch: baseLogs.pubsub.sublog('ack-batch') as LoggingFunction,
 };
 
 export interface ReducedMessage {

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} from './logs';
+import {logs as baseLogs, LoggingFunction} from './logs';
 
 /**
  * Loggers. Exported for unit tests.
  *
  * @private
  */
 export const logs = {
-  subscriberStreams: baseLogs.pubsub.sublog('subscriber-streams'),
+  subscriberStreams: baseLogs.pubsub.sublog('subscriber-streams') as LoggingFunction,
 };
 
 /*!

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} from '../logs';
+import {logs as baseLogs, LoggingFunction} from '../logs';
 
 /**
  * Loggers. Exported for unit tests.
  *
  * @private
  */
 export const logs = {
-  publishBatch: baseLogs.pubsub.sublog('publish-batch'),
+  publishBatch: baseLogs.pubsub.sublog('publish-batch') as LoggingFunction,
 };
 
 /**

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<AuthClient>);
     this.projectId = this.options.projectId || PROJECT_ID_PLACEHOLDER;
     if (this.projectId !== PROJECT_ID_PLACEHOLDER) {
       this.name = PubSub.formatName_(this.projectId);

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;