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

refactor(monitoring): replace request with helix-fetch #95

Merged
merged 6 commits into from
Jul 2, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions .vscode/launch.json
Expand Up @@ -8,13 +8,19 @@
"type": "node",
"request": "attach",
"name": "Attach",
"skipFiles": [
"<node_internals>/**"
],
"port": 9229
},
{
"type": "node",
"request": "launch",
"name": "Mocha All",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"skipFiles": [
"<node_internals>/**"
],
"args": [
"--timeout",
"999999",
Expand All @@ -29,6 +35,9 @@
"request": "launch",
"name": "Mocha Current File",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"skipFiles": [
"<node_internals>/**"
],
"args": [
"--timeout",
"999999",
Expand All @@ -37,15 +46,6 @@
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
},
{
"type": "node",
"request": "launch",
"name": "Launch 'hlx up'",
"program": "${workspaceFolder}/index.js",
"args":[
"up"
]
}
]
}
108 changes: 104 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Expand Up @@ -25,6 +25,7 @@
},
"homepage": "https://github.com/adobe/helix-ops#readme",
"dependencies": {
"@adobe/helix-fetch": "^1.7.0",
"diff": "4.0.2",
"fs-extra": "9.0.1",
"get-stream": "5.1.0",
Expand Down
27 changes: 17 additions & 10 deletions src/statuspage/cli.js
Expand Up @@ -12,9 +12,13 @@

const yargs = require('yargs');
const fs = require('fs');
const request = require('request-promise-native');
const fetchAPI = require('@adobe/helix-fetch');
const { getIncubatorName } = require('../utils');

const { fetch } = process.env.HELIX_FETCH_FORCE_HTTP1
? fetchAPI.context({ httpsProtocols: ['http1'] })
: fetchAPI;

rofe marked this conversation as resolved.
Show resolved Hide resolved
function getIncubatorPageId(pageId, incubatorPageId) {
return incubatorPageId || pageId;
}
Expand Down Expand Up @@ -62,12 +66,12 @@ class CLI {
async function getComponentInfo(auth, pageid, group, name) {
try {
const result = {};
result.allComps = await request.get(`https://api.statuspage.io/v1/pages/${pageid}/components`, {
const resp = await fetch(`https://api.statuspage.io/v1/pages/${pageid}/components`, {
headers: {
Authorization: auth,
},
json: true,
});
result.allComps = await resp.json();

result.component = result.allComps.find((comp) => comp.name === name);

Expand Down Expand Up @@ -98,15 +102,16 @@ class CLI {
}
logger.log(msg);
try {
return await request.post(`https://api.statuspage.io/v1/pages/${pageid}/components`, {
json: true,
const resp = await fetch(`https://api.statuspage.io/v1/pages/${pageid}/components`, {
method: 'POST',
headers: {
Authorization: auth,
},
body: {
json: {
component,
},
});
return await resp.json();
} catch (e) {
logger.error('Component creation failed:', e.message);
process.exit(1);
Expand All @@ -125,15 +130,16 @@ class CLI {
if (Object.keys(component).length > 0) {
logger.log('Updating component', comp.name);
try {
return await request.patch(`https://api.statuspage.io/v1/pages/${pageid}/components/${comp.id}`, {
json: true,
const resp = await fetch(`https://api.statuspage.io/v1/pages/${pageid}/components/${comp.id}`, {
method: 'PATCH',
headers: {
Authorization: auth,
},
body: {
json: {
component,
},
});
return await resp.json();
} catch (e) {
logger.error('Component update failed:', e.message);
}
Expand All @@ -154,8 +160,9 @@ class CLI {
if (component) {
logger.log('Deleting incubator component', component.name);
try {
await request.delete(`https://api.statuspage.io/v1/pages/${ipageid || pageid}/components/${component.id}`, {
await fetch(`https://api.statuspage.io/v1/pages/${ipageid || pageid}/components/${component.id}`, {
json: true,
method: 'DELETE',
headers: {
Authorization: auth,
},
Expand Down
2 changes: 2 additions & 0 deletions test/testStatuspage.js
Expand Up @@ -16,6 +16,8 @@ const assert = require('assert');
const shell = require('shelljs');
const sinon = require('sinon');

process.env.HELIX_FETCH_FORCE_HTTP1 = 'true';
rofe marked this conversation as resolved.
Show resolved Hide resolved

const Statuspage = require('../src/statuspage/cli');
const StatuspageAPI = require('./statuspage/StatuspageAPI');
const { getTimedPromise } = require('./utils');
Expand Down