build!: update library to use Node 12 (#706)

* build!: Update library to use Node 12 Co-authored-by: Summer Ji <[email protected]> Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
googleapis · May 24, 2022 · 63d6a93 · 63d6a93
1 parent 433cc45
commit 63d6a93
Show file tree

Hide file tree

Showing 21 changed files with 17 additions and 157 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/.kokoro/presubmit/node10/common.cfg b/.kokoro/presubmit/node10/common.cfg
diff --git a/.kokoro/presubmit/node10/docs.cfg b/.kokoro/presubmit/node10/docs.cfg
diff --git a/.kokoro/presubmit/node10/lint.cfg b/.kokoro/presubmit/node10/lint.cfg
diff --git a/.kokoro/presubmit/node10/samples-test.cfg b/.kokoro/presubmit/node10/samples-test.cfg
diff --git a/.kokoro/presubmit/node10/system-test.cfg b/.kokoro/presubmit/node10/system-test.cfg
diff --git a/.kokoro/presubmit/node10/test.cfg b/.kokoro/presubmit/node10/test.cfg
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "license": "Apache-2.0",
   "author": "Google Inc.",
   "engines": {
-    "node": ">=10"
+    "node": ">=12.0.0"
   },
   "repository": "googleapis/nodejs-logging-winston",
   "main": "./build/src/index.js",
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "@google-cloud/logging": "^9.6.9",
-    "google-auth-library": "^7.0.0",
+    "google-auth-library": "^8.0.2",
     "lodash.mapvalues": "^4.6.0",
     "winston-transport": "^4.3.0"
   },
@@ -66,12 +66,12 @@
     "@types/uuid": "^8.0.0",
     "c8": "^7.0.0",
     "codecov": "^3.5.0",
-    "gts": "^2.0.0",
+    "gts": "^3.1.0",
     "linkinator": "^2.0.0",
-    "mocha": "^8.0.0",
+    "mocha": "^9.2.2",
     "post-install-check": "0.0.1",
     "proxyquire": "^2.1.0",
-    "typescript": "^3.9.7",
+    "typescript": "^4.6.4",
     "uuid": "^8.0.0",
     "winston": "^3.2.1"
   },

diff --git a/samples/package.json b/samples/package.json
@@ -8,7 +8,7 @@
   "author": "Google Inc.",
   "repository": "googleapis/nodejs-logging-winston",
   "engines": {
-    "node": ">=10"
+    "node": ">=12.0.0"
   },
   "scripts": {
     "test": "mocha --timeout 600000"
@@ -21,4 +21,4 @@
     "chai": "^4.2.0",
     "mocha": "^8.0.0"
   }
-}
+}
diff --git a/system-test/errors-transport.ts b/system-test/errors-transport.ts
@@ -64,7 +64,7 @@ export class ErrorsApiTransport extends common.Service {
   async request(options: common.DecorateRequestOptions) {
     return new Promise<ApiResponse>((resolve, reject) => {
       super.request(options, (err, _, res) =>
-        err ? reject(err) : resolve(res)
+        err ? reject(err) : resolve(res as common.ResponseBody)
       );
     });
   }

diff --git a/system-test/test-middleware-express.ts b/system-test/test-middleware-express.ts
@@ -58,7 +58,7 @@ describe(__filename, () => {
     it('should write request correlated log entries', function () {
       this.timeout(TEST_TIMEOUT);
       // eslint-disable-next-line no-async-promise-executor
-      return new Promise(async resolve => {
+      return new Promise<void>(async resolve => {
         const logger = winston.createLogger();
         const mw = await elb.makeMiddleware(logger, {
           logName: LOG_NAME,

diff --git a/test/common.ts b/test/common.ts
@@ -22,6 +22,11 @@ import {LoggingCommon} from '../src/common';
 
 declare const global: {[index: string]: {} | null};
 
+interface Metadata {
+  value(): void;
+  labels?: {label2?: string};
+}
+
 describe('logging-common', () => {
   let fakeLogInstance: Logging;
   let fakeLoggingOptions_: Options | null;
@@ -508,7 +513,7 @@ describe('logging-common', () => {
     const MESSAGE = 'message';
     const PREFIX = 'prefix';
     const LABELS = {label1: 'value1'};
-    const METADATA = {value: () => {}, labels: {label2: 'value2'}};
+    const METADATA: Metadata = {value: () => {}, labels: {label2: 'value2'}};
 
     beforeEach(() => {
       const opts = Object.assign({}, OPTIONS, {