Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: bump cimg/node to 14.21 #318

Merged
merged 6 commits into from
Nov 8, 2022
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1
executors:
node14:
docker:
- image: cimg/node:14.20
- image: cimg/node:14.21

orbs:
codecov: codecov/[email protected]
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
"nock": "13.2.9",
"nyc": "15.1.0",
"parse-cache-control": "1.0.1",
"pem": "1.14.6",
"semantic-release": "19.0.5",
"sinon": "14.0.1",
"stream-buffers": "3.0.2"
Expand Down
1 change: 1 addition & 0 deletions test/keys.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"cert":"-----BEGIN CERTIFICATE-----\nMIICpDCCAYwCCQCSYPsUCKH+wzANBgkqhkiG9w0BAQsFADAUMRIwEAYDVQQDDAls\nb2NhbGhvc3QwHhcNMjIxMTA4MTMyMDIzWhcNMjMxMTA4MTMyMDIzWjAUMRIwEAYD\nVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm\nKWgvh/WI2PEL4jUXwba77Ugj5vh8vRvAqcMk0bKJEnnXqbtsyp021UZfKtdVANov\ncJ71UwN3fqNzjCfai385PM/bS24Uny2e3+oNvqQE3HmX46jUO0AcFYlXGmFn8rGd\ntzQCixLubof8IK0NmOO/OTfzWhOL+E3wLkeT15Bsn9qBgfRAZPlXVkboteduRmyj\naRGw37WrzmUEWnK69uX8OUs4jqVEdX5UJw3MAfljFplBOnOW0uC9fmvWd7v8pPT1\nmDBwjVbDHmxkKLSFm4pwoJ+lFlrJpnL4U+sh56/+7+sDqiJyyrtDjHOCBMgmqsmk\nGUm281XeUVx0+heESJilAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAOBnEQWYsdpJ\nM2LRWNdF82hB1EkNX/NUBb0uqezBTOvPRmJNjZIbXLSbkYOJlm0vrZ1wLpwJYm2j\nmdiSEvCBrSTRc9+lbsUmZ/OTNlOzThxG7QontBMImpLjSNPTZN3OMb2MQMqen4ty\nrdYdfNxQg5EHUz6lnDzaijPMar8SprKBmjdv2Tdh5B/VxpORGNKam+tTLIqVrLZP\nj1SmVrPPxTC3QJfZTSyzq9W2xBdImj/9xpPinaQPh7SF1PFBL6zYffE2r/oSec6n\ni6itk4YldhZUvhd4WgeaIXOYrBjeQhouKqH/rRYi5iW5NAdf1Vxzk2tTlVYltBie\nksdvxCLDEGU=\n-----END CERTIFICATE-----","key":"-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA5iloL4f1iNjxC+I1F8G2u+1II+b4fL0bwKnDJNGyiRJ516m7\nbMqdNtVGXyrXVQDaL3Ce9VMDd36jc4wn2ot/OTzP20tuFJ8tnt/qDb6kBNx5l+Oo\n1DtAHBWJVxphZ/Kxnbc0AosS7m6H/CCtDZjjvzk381oTi/hN8C5Hk9eQbJ/agYH0\nQGT5V1ZG6LXnbkZso2kRsN+1q85lBFpyuvbl/DlLOI6lRHV+VCcNzAH5YxaZQTpz\nltLgvX5r1ne7/KT09ZgwcI1Wwx5sZCi0hZuKcKCfpRZayaZy+FPrIeev/u/rA6oi\ncsq7Q4xzggTIJqrJpBlJtvNV3lFcdPoXhEiYpQIDAQABAoIBABysyfsqADA1fwqQ\n+zZjfwW40UUP0KOR1/RP8i0TJyAmuiFhVyV9tMqRFbxjlQJVIdnJOTStTABGOcz6\niDiVKpuR9P+ITUWqcz+Y/AsMVlj4svl2dqFCZIFbOYotkjcmKHTSz1sFwq0L/ksu\nMwE/rBg147+g2FCW9fbXfTlxIOA3abwzMIY5mZZfh0pyZr/L/vqfwJYcNgkmsf/N\nTQd3rZf6iXST7SrG3vUW791JiZsRd+6ANQTt8ih+m4bq/JrOOLb5aXoeBrGhlHMB\nK7bHfMak675TpYgKF6v1I6n5SauX4WjqISubtPUjue3dg5WFvStgLtUbvCdVjaBW\nowsgut0CgYEA+LCGYjYaMCLWKyg5X+FpE/wSMjjoBI4g12T4sPSpIN3fJZudOVQB\nYgHHPAkk6lWD1+7eCaf5C95ICPWrfJZC0vgK/zg40LHdEGxFY62UM1o6Du9VWHGk\naG24Jk/LlSwZxCbcAEeJqmJRm2369CmAEJ3uZJRLoe3DJoGXJKeNOvMCgYEA7O10\nMgX2I0i4Pc1p5kMxOTfa9TtuO/fv3F3YDvFEXLD802aokIGuV5Swnk2m8kBtEYZH\nG8vUj7lYT1QZbFX1qk8A5z2tAjzD4XPW8KdEllKz3tWw1dT2exktkt8Pavdommfv\nNWWTQbOm6rcHzrBnXqkBeISt3wxgB0zkXQArFAcCgYEAg3Q79JoIib1AXButCEOM\nWaX6sFVoP1Aph/G1i0QoSlk9ZRG2r+D5wiaSe+eRfdSqFnALKiuB94YNqb7CYN7E\nf+PhXDsJvTbnVZEFtMTB+8sLuW1FPbUEZLbqikXPpRBkpkysKfGmkUvbOz+NUZbG\nPQJeSwggWn3lk+sYS6XNf4UCgYEAz9NOfF6sVLECI/wea4P/FpC/OSPDg0juFuAe\nmKTb8W6yp4FCVVfbpSlhb8rvqUoIIjol/+Tg9J2BMDy1/Ei+sICSa0S3kOHadNXW\n8cvXpwCulMXfUwJ2nu4sAsw1Sv/wuph2xODvtc8vmG2qpIwqcGdRSfUgSyogxeaV\n3lo6b1sCgYBX2hZjtyfKvXq/ApT78oXnrb19wuB2ZMRheK/SKVHygwqOUeRXH6Ig\nXdLQO4LpbjCRHHhYi4ElA0mPfgZyC6dVrH7wRf5fVXHlATXtgeCpmU7ep0WLWsFH\nhLMGFH75fuatF2ctW6eimP07SvUohrVYuNIsHiAuHQ+0/rz9dMygfg==\n-----END RSA PRIVATE KEY-----"}
13 changes: 3 additions & 10 deletions test/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,10 @@

'use strict';

const { readFile } = require('fs').promises;
const http = require('http');
const https = require('https');
const http2 = require('http2');
const util = require('util');

const pem = require('pem');

const createCertificate = util.promisify(pem.createCertificate);

const WOKEUP = 'woke up!';
const sleep = (ms) => new Promise((resolve) => {
Expand Down Expand Up @@ -78,11 +74,8 @@ class Server {
const createServer = async (handler) => {
let options = {};
if (this.secure) {
const keys = await createCertificate({ selfSigned: true });
options = {
key: keys.serviceKey,
cert: keys.certificate,
};
const keys = JSON.parse(await readFile(`${__dirname}/keys.json`));
options = { ...keys };
}
// merge with user-provided options
options = { ...options, ...this.options };
Expand Down