Fixes for google-gax major version update

Author: MarkDuckworth

dev/src/bulk-writer.ts

@@ -292,8 +292,8 @@ class BulkCommitBatch extends WriteBatch {
             this.pendingOps[i].onSuccess(new WriteResult(updateTime));
           } else {
             const error =
-              new (require('google-gax/build/src/fallback').GoogleError)(
-                status.message || undefined,
+              new (require('google-gax/fallback').GoogleError)(
+                status.message || undefined
               );
             error.code = status.code as number;
             this.pendingOps[i].onError(wrapError(error, stack));

dev/src/index.ts

@@ -620,7 +620,7 @@ export class Firestore implements firestore.Firestore {
         let gax: typeof googleGax | typeof googleGaxFallback;
         if (useFallback) {
           if (!this._gaxFallback) {
-            gax = this._gaxFallback = require('google-gax/build/src/fallback');
+            gax = this._gaxFallback = require('google-gax/fallback');
           } else {
             gax = this._gaxFallback;
           }
@@ -1591,7 +1591,7 @@ export class Firestore implements firestore.Firestore {
     if (retryCodes) {
       const retryParams = getRetryParams(methodName);
       callOptions.retry =
-        new (require('google-gax/build/src/fallback').RetryOptions)(
+        new (require('google-gax/fallback').RetryOptions)(
           retryCodes,
           retryParams,
         );

dev/src/recursive-delete.ts

@@ -291,7 +291,7 @@ export class RecursiveDelete {
       if (this.lastError === undefined) {
         this.completionDeferred.resolve();
       } else {
-        let error = new (require('google-gax/build/src/fallback').GoogleError)(
+        let error = new (require('google-gax/fallback').GoogleError)(
           `${this.errorCount} ` +
             `${this.errorCount !== 1 ? 'deletes' : 'delete'} ` +
             'failed. The last delete failed with: ',

dev/src/util.ts

@@ -162,11 +162,11 @@ let serviceConfig: Record<string, CallSettings> | undefined;
  **/
 function getServiceConfig(methodName: string): CallSettings | undefined {
   if (!serviceConfig) {
-    serviceConfig = require('google-gax/build/src/fallback').constructSettings(
+    serviceConfig = require('google-gax/fallback').constructSettings(
       'google.firestore.v1.Firestore',
       gapicConfig as ClientConfig,
       {},
-      require('google-gax/build/src/status').Status,
+      require('google-gax').Status
     ) as {[k: string]: CallSettings};
   }
   return serviceConfig[methodName];
@@ -205,7 +205,7 @@ export function getTotalTimeout(methodName: string): number {
 export function getRetryParams(methodName: string): BackoffSettings {
   return (
     getServiceConfig(methodName)?.retry?.backoffSettings ??
-    require('google-gax/build/src/fallback').createDefaultBackoffSettings()
+    require('google-gax/fallback').createDefaultBackoffSettings()
   );
 }