Merge branch 'main' into fix-bytes-type-buffer

googleapis · Oct 2, 2024 · 0ba3edb · 0ba3edb
2 parents d928b84 + 629f4c4
commit 0ba3edb
Show file tree

Hide file tree

Showing 8 changed files with 2,280 additions and 792 deletions.
diff --git a/gax/package.json b/gax/package.json
@@ -51,6 +51,7 @@
     "mocha": "^9.0.0",
     "ncp": "^2.0.0",
     "null-loader": "^4.0.0",
+    "pdfmake": "0.2.12",
     "protobufjs-cli": "1.1.3",
     "proxyquire": "^2.0.1",
     "pumpify": "^2.0.0",
@@ -63,6 +64,7 @@
     "webpack": "^4.0.0",
     "webpack-cli": "^4.0.0"
   },
+
   "scripts": {
     "docs": "compodoc src/",
     "pretest": "npm run prepare",

diff --git a/gax/src/gax.ts b/gax/src/gax.ts
@@ -386,6 +386,15 @@ export function convertRetryOptions(
     // this is in seconds and needs to be converted to milliseconds and the totalTimeoutMillis parameter
     if (options.retryRequestOptions.totalTimeout !== undefined) {
       totalTimeoutMillis = options.retryRequestOptions.totalTimeout * 1000;
+    } else {
+      if (options.maxRetries === undefined) {
+        totalTimeoutMillis = 30000;
+        warn(
+          'retry_request_options_no_max_retries_timeout',
+          'Neither maxRetries nor totalTimeout were passed. Defaulting to totalTimeout of 30000ms.',
+          'MissingParameterWarning'
+        );
+      }
     }
 
     // for the variables the user wants to override, override in the backoff settings object we made