diff --git a/.eslintrc.json b/.eslintrc.json index b3069eb689..73acfd71ca 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -5,8 +5,6 @@ }, "rules": { "node/no-missing-require": ["off"], - "node/no-unpublished-require": ["off"], - "node/no-deprecated-api": ["off"], - "no-process-exit": ["off"] + "node/no-unpublished-require": ["off"] } } \ No newline at end of file diff --git a/cloud-sql/mysql/mysql/server.js b/cloud-sql/mysql/mysql/server.js index bf85ca5357..2757302c54 100644 --- a/cloud-sql/mysql/mysql/server.js +++ b/cloud-sql/mysql/mysql/server.js @@ -130,7 +130,7 @@ const poolPromise = createPool() }) .catch(err => { logger.error(err); - process.exit(1); + throw err; }); app.use(async (req, res, next) => { @@ -222,7 +222,7 @@ const server = app.listen(PORT, () => { process.on('unhandledRejection', err => { console.error(err); - process.exit(1); + throw err; }); module.exports = server; diff --git a/cloud-sql/sqlserver/mssql/server.js b/cloud-sql/sqlserver/mssql/server.js index 320c8abad8..20151559c1 100644 --- a/cloud-sql/sqlserver/mssql/server.js +++ b/cloud-sql/sqlserver/mssql/server.js @@ -107,7 +107,7 @@ const poolPromise = createPool() }) .catch(err => { logger.error(err); - process.exit(1); + throw err; }); app.use(async (req, res, next) => { @@ -224,7 +224,7 @@ const environment = process.env.NODE_ENV || 'development'; if (environment === 'development') { process.on('unhandledRejection', err => { console.error(err); - process.exit(1); + throw err; }); } diff --git a/eventarc/audit-storage/test/system.test.js b/eventarc/audit-storage/test/system.test.js index b028f53ef2..159f30037a 100644 --- a/eventarc/audit-storage/test/system.test.js +++ b/eventarc/audit-storage/test/system.test.js @@ -14,7 +14,6 @@ const assert = require('assert'); const got = require('got'); -const {resolve} = require('url'); const request = (method, route, base_url) => { const {ID_TOKEN} = process.env; @@ -22,7 +21,7 @@ const request = (method, route, base_url) => { throw Error('"ID_TOKEN" environment variable is required.'); } - return got(resolve(base_url.trim(), route), { + return got(new URL(route, base_url.trim()), { headers: { Authorization: `Bearer ${ID_TOKEN.trim()}`, }, diff --git a/eventarc/generic/test/system.test.js b/eventarc/generic/test/system.test.js index b028f53ef2..159f30037a 100644 --- a/eventarc/generic/test/system.test.js +++ b/eventarc/generic/test/system.test.js @@ -14,7 +14,6 @@ const assert = require('assert'); const got = require('got'); -const {resolve} = require('url'); const request = (method, route, base_url) => { const {ID_TOKEN} = process.env; @@ -22,7 +21,7 @@ const request = (method, route, base_url) => { throw Error('"ID_TOKEN" environment variable is required.'); } - return got(resolve(base_url.trim(), route), { + return got(new URL(route, base_url.trim()), { headers: { Authorization: `Bearer ${ID_TOKEN.trim()}`, }, diff --git a/eventarc/pubsub/test/system.test.js b/eventarc/pubsub/test/system.test.js index b028f53ef2..159f30037a 100644 --- a/eventarc/pubsub/test/system.test.js +++ b/eventarc/pubsub/test/system.test.js @@ -14,7 +14,6 @@ const assert = require('assert'); const got = require('got'); -const {resolve} = require('url'); const request = (method, route, base_url) => { const {ID_TOKEN} = process.env; @@ -22,7 +21,7 @@ const request = (method, route, base_url) => { throw Error('"ID_TOKEN" environment variable is required.'); } - return got(resolve(base_url.trim(), route), { + return got(new URL(route, base_url.trim()), { headers: { Authorization: `Bearer ${ID_TOKEN.trim()}`, }, diff --git a/run/hello-broken/package.json b/run/hello-broken/package.json index 5cc803e074..a273ea76b8 100644 --- a/run/hello-broken/package.json +++ b/run/hello-broken/package.json @@ -11,6 +11,9 @@ "lint": "eslint '**/*.js'", "fix": "eslint --fix '**/*.js'" }, + "engines": { + "node": ">= 10.0.0" + }, "author": "Google LLC", "license": "Apache-2.0", "dependencies": { diff --git a/run/hello-broken/test/system.test.js b/run/hello-broken/test/system.test.js index 0f43eb6546..f7fd7e7689 100644 --- a/run/hello-broken/test/system.test.js +++ b/run/hello-broken/test/system.test.js @@ -14,7 +14,6 @@ const assert = require('assert'); const request = require('got'); -const {resolve} = require('url'); const get = (route, base_url) => { const {ID_TOKEN} = process.env; @@ -22,7 +21,7 @@ const get = (route, base_url) => { throw Error('"ID_TOKEN" environment variable is required.'); } - return request(resolve(base_url.trim(), route), { + return request(new URL(route, base_url.trim()), { headers: { Authorization: `Bearer ${ID_TOKEN.trim()}`, }, diff --git a/run/helloworld/package.json b/run/helloworld/package.json index 11f958a3b6..209403ac42 100644 --- a/run/helloworld/package.json +++ b/run/helloworld/package.json @@ -11,6 +11,9 @@ "lint": "eslint '**/*.js'", "fix": "eslint --fix '**/*.js'" }, + "engines": { + "node": ">= 12.0.0" + }, "author": "Google LLC", "license": "Apache-2.0", "dependencies": { diff --git a/run/helloworld/test/system.test.js b/run/helloworld/test/system.test.js index 0e60988ac7..bea717b1da 100644 --- a/run/helloworld/test/system.test.js +++ b/run/helloworld/test/system.test.js @@ -14,7 +14,6 @@ const assert = require('assert'); const request = require('got'); -const {resolve} = require('url'); const get = (route, base_url) => { const {ID_TOKEN} = process.env; @@ -22,7 +21,7 @@ const get = (route, base_url) => { throw Error('"ID_TOKEN" environment variable is required.'); } - return request(resolve(base_url.trim(), route), { + return request(new URL(route, base_url.trim()), { headers: { Authorization: `Bearer ${ID_TOKEN.trim()}`, }, diff --git a/run/image-processing/test/system.test.js b/run/image-processing/test/system.test.js index cfdfe72c74..f93257cd6e 100644 --- a/run/image-processing/test/system.test.js +++ b/run/image-processing/test/system.test.js @@ -14,7 +14,6 @@ const assert = require('assert'); const got = require('got'); -const {resolve} = require('url'); const request = (method, route, base_url) => { const {ID_TOKEN} = process.env; @@ -22,7 +21,7 @@ const request = (method, route, base_url) => { throw Error('"ID_TOKEN" environment variable is required.'); } - return got(resolve(base_url.trim(), route), { + return got(new URL(route, base_url.trim()), { headers: { Authorization: `Bearer ${ID_TOKEN.trim()}`, }, diff --git a/run/markdown-preview/renderer/test/system.test.js b/run/markdown-preview/renderer/test/system.test.js index cfdfe72c74..e0db5fcf79 100644 --- a/run/markdown-preview/renderer/test/system.test.js +++ b/run/markdown-preview/renderer/test/system.test.js @@ -14,7 +14,6 @@ const assert = require('assert'); const got = require('got'); -const {resolve} = require('url'); const request = (method, route, base_url) => { const {ID_TOKEN} = process.env; @@ -22,7 +21,7 @@ const request = (method, route, base_url) => { throw Error('"ID_TOKEN" environment variable is required.'); } - return got(resolve(base_url.trim(), route), { + return got(route, new URL(base_url.trim()), { headers: { Authorization: `Bearer ${ID_TOKEN.trim()}`, }, diff --git a/run/pubsub/test/system.test.js b/run/pubsub/test/system.test.js index cfdfe72c74..f93257cd6e 100644 --- a/run/pubsub/test/system.test.js +++ b/run/pubsub/test/system.test.js @@ -14,7 +14,6 @@ const assert = require('assert'); const got = require('got'); -const {resolve} = require('url'); const request = (method, route, base_url) => { const {ID_TOKEN} = process.env; @@ -22,7 +21,7 @@ const request = (method, route, base_url) => { throw Error('"ID_TOKEN" environment variable is required.'); } - return got(resolve(base_url.trim(), route), { + return got(new URL(route, base_url.trim()), { headers: { Authorization: `Bearer ${ID_TOKEN.trim()}`, }, diff --git a/run/system-package/package.json b/run/system-package/package.json index a4011fe51e..5dfd256bcc 100644 --- a/run/system-package/package.json +++ b/run/system-package/package.json @@ -9,6 +9,9 @@ "test": "mocha test/app.test.js --check-leaks", "system-test": "test/runner.sh mocha test/system.test.js --timeout=10000" }, + "engines": { + "node": ">= 12.0.0" + }, "dependencies": { "express": "^4.17.1" }, diff --git a/run/system-package/test/system.test.js b/run/system-package/test/system.test.js index c8158c3090..e463b3bf72 100644 --- a/run/system-package/test/system.test.js +++ b/run/system-package/test/system.test.js @@ -14,7 +14,6 @@ const assert = require('assert'); const got = require('got'); -const {resolve} = require('url'); const request = (method, route, base_url) => { const {ID_TOKEN} = process.env; @@ -22,7 +21,7 @@ const request = (method, route, base_url) => { throw Error('"ID_TOKEN" environment variable is required.'); } - return got(resolve(base_url.trim(), route), { + return got(new URL(route, base_url.trim()), { headers: { Authorization: `Bearer ${ID_TOKEN.trim()}`, },