Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
}
4 changes: 2 additions & 2 deletions cloud-sql/mysql/mysql/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const poolPromise = createPool()
})
.catch(err => {
logger.error(err);
process.exit(1);
throw err;
});

app.use(async (req, res, next) => {
Expand Down Expand Up @@ -222,7 +222,7 @@ const server = app.listen(PORT, () => {

process.on('unhandledRejection', err => {
console.error(err);
process.exit(1);
throw err;
});

module.exports = server;
4 changes: 2 additions & 2 deletions cloud-sql/sqlserver/mssql/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const poolPromise = createPool()
})
.catch(err => {
logger.error(err);
process.exit(1);
throw err;
});

app.use(async (req, res, next) => {
Expand Down Expand Up @@ -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;
});
}

Expand Down
3 changes: 1 addition & 2 deletions eventarc/audit-storage/test/system.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@

const assert = require('assert');
const got = require('got');
const {resolve} = require('url');

const request = (method, route, base_url) => {
const {ID_TOKEN} = process.env;
if (!ID_TOKEN) {
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()}`,
},
Expand Down
3 changes: 1 addition & 2 deletions eventarc/generic/test/system.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@

const assert = require('assert');
const got = require('got');
const {resolve} = require('url');

const request = (method, route, base_url) => {
const {ID_TOKEN} = process.env;
if (!ID_TOKEN) {
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()}`,
},
Expand Down
3 changes: 1 addition & 2 deletions eventarc/pubsub/test/system.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@

const assert = require('assert');
const got = require('got');
const {resolve} = require('url');

const request = (method, route, base_url) => {
const {ID_TOKEN} = process.env;
if (!ID_TOKEN) {
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()}`,
},
Expand Down
3 changes: 3 additions & 0 deletions run/hello-broken/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"lint": "eslint '**/*.js'",
"fix": "eslint --fix '**/*.js'"
},
"engines": {
"node": ">= 10.0.0"
},
"author": "Google LLC",
"license": "Apache-2.0",
"dependencies": {
Expand Down
3 changes: 1 addition & 2 deletions run/hello-broken/test/system.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@

const assert = require('assert');
const request = require('got');
const {resolve} = require('url');

const get = (route, base_url) => {
const {ID_TOKEN} = process.env;
if (!ID_TOKEN) {
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()}`,
},
Expand Down
3 changes: 3 additions & 0 deletions run/helloworld/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"lint": "eslint '**/*.js'",
"fix": "eslint --fix '**/*.js'"
},
"engines": {
"node": ">= 12.0.0"
},
"author": "Google LLC",
"license": "Apache-2.0",
"dependencies": {
Expand Down
3 changes: 1 addition & 2 deletions run/helloworld/test/system.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@

const assert = require('assert');
const request = require('got');
const {resolve} = require('url');

const get = (route, base_url) => {
const {ID_TOKEN} = process.env;
if (!ID_TOKEN) {
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()}`,
},
Expand Down
3 changes: 1 addition & 2 deletions run/image-processing/test/system.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@

const assert = require('assert');
const got = require('got');
const {resolve} = require('url');

const request = (method, route, base_url) => {
const {ID_TOKEN} = process.env;
if (!ID_TOKEN) {
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()}`,
},
Expand Down
3 changes: 1 addition & 2 deletions run/markdown-preview/renderer/test/system.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@

const assert = require('assert');
const got = require('got');
const {resolve} = require('url');

const request = (method, route, base_url) => {
const {ID_TOKEN} = process.env;
if (!ID_TOKEN) {
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()}`,
},
Expand Down
3 changes: 1 addition & 2 deletions run/pubsub/test/system.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@

const assert = require('assert');
const got = require('got');
const {resolve} = require('url');

const request = (method, route, base_url) => {
const {ID_TOKEN} = process.env;
if (!ID_TOKEN) {
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()}`,
},
Expand Down
3 changes: 3 additions & 0 deletions run/system-package/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
3 changes: 1 addition & 2 deletions run/system-package/test/system.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@

const assert = require('assert');
const got = require('got');
const {resolve} = require('url');

const request = (method, route, base_url) => {
const {ID_TOKEN} = process.env;
if (!ID_TOKEN) {
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()}`,
},
Expand Down