build!: drop node 10 from engines list, update typescript to 4.6.3 (#477

)
googleapis · Apr 19, 2022 · a926962 · a926962
1 parent 627304c
commit a926962
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 97 deletions.
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -9,9 +9,9 @@ branchProtectionRules:
       - "ci/kokoro: System test"
       - docs
       - lint
-      - test (10)
       - test (12)
       - test (14)
+      - test (16)
       - cla/google
       - windows
       - OwlBot Post Processor
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [10, 12, 14]
+        node: [12, 14, 16]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

diff --git a/.kokoro/continuous/node10/common.cfg b/.kokoro/continuous/node10/common.cfg
diff --git a/.kokoro/continuous/node10/docs.cfg b/.kokoro/continuous/node10/docs.cfg
diff --git a/.kokoro/continuous/node10/lint.cfg b/.kokoro/continuous/node10/lint.cfg
diff --git a/.kokoro/continuous/node10/samples-test.cfg b/.kokoro/continuous/node10/samples-test.cfg
diff --git a/.kokoro/continuous/node10/system-test.cfg b/.kokoro/continuous/node10/system-test.cfg
diff --git a/.kokoro/continuous/node10/test.cfg b/.kokoro/continuous/node10/test.cfg
diff --git a/.kokoro/continuous/node8/common.cfg b/.kokoro/continuous/node8/common.cfg
diff --git a/.kokoro/continuous/node8/test.cfg b/.kokoro/continuous/node8/test.cfg
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "google"
   ],
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "author": "Google, LLC",
   "license": "Apache-2.0",
@@ -46,7 +46,7 @@
     "@types/multiparty": "0.0.33",
     "@types/mv": "^2.1.0",
     "@types/ncp": "^2.0.1",
-    "@types/node": "^16.11.3",
+    "@types/node": "^17.0.23",
     "@types/node-fetch": "^2.5.7",
     "@types/sinon": "^10.0.0",
     "@types/tmp": "0.2.3",
@@ -58,7 +58,7 @@
     "execa": "^5.0.0",
     "express": "^4.16.4",
     "form-data": "^4.0.0",
-    "gts": "^3.0.0",
+    "gts": "^3.1.0",
     "is-docker": "^2.0.0",
     "karma": "^6.0.0",
     "karma-chrome-launcher": "^3.0.0",
@@ -80,7 +80,7 @@
     "stream-browserify": "^3.0.0",
     "tmp": "0.2.1",
     "ts-loader": "^8.0.0",
-    "typescript": "^3.8.3",
+    "typescript": "^4.6.3",
     "uuid": "^8.0.0",
     "webpack": "^5.35.0",
     "webpack-cli": "^4.0.0"

diff --git a/src/gaxios.ts b/src/gaxios.ts
@@ -165,7 +165,7 @@ export class Gaxios {
     } catch (e) {
       const err = e as GaxiosError;
       err.config = opts;
-      const {shouldRetry, config} = await getRetryConfig(e);
+      const {shouldRetry, config} = await getRetryConfig(err);
       if (shouldRetry && config) {
         err.config.retryConfig!.currentRetryAttempt =
           config.retryConfig!.currentRetryAttempt;

diff --git a/test/test.retry.ts b/test/test.retry.ts
@@ -104,7 +104,8 @@ describe('🛸 retry & exponential backoff', () => {
     try {
       await req;
       throw Error('unreachable');
-    } catch (err) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (err: any) {
       assert(err.config);
       assert.strictEqual(err.config.retryConfig.currentRetryAttempt, 0);
     }