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.

Sign up for GitHub

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

Move to a modern testing infrastructure #304

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Move to a modern testing infrastructure #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7ffdd3
Promisify boot
ishitatsuyuki Mar 22, 2018
c2a1bcf
Promisify docker
ishitatsuyuki Mar 22, 2018
5e3400b
Move to a modern testing infrastructure
ishitatsuyuki Mar 21, 2018
30a2251
async-ify
ishitatsuyuki Apr 17, 2018
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
26 changes: 0 additions & 26 deletions .eslintrc-node.js
View file
Open in desktop

This file was deleted.

30 changes: 30 additions & 0 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
module.exports = {
'env': {
'browser': false,
'es6': true,
'node': true
},
'extends': [
'eslint:recommended',
'plugin:node/recommended',
'standard'
],
'plugins': [
'node'
],
'rules': {
// Override some of standard js rules
'semi': [ 'error', 'always' ],
'comma-dangle': [ 'error', 'only-multiline' ],
'camelcase': 'off',
'no-var': 'error',
'prefer-const': 'error',
'arrow-parens': [ 'error', 'as-needed' ],
'standard/array-bracket-even-spacing': 'off',
'array-bracket-spacing': [ 'error', 'always', { 'objectsInArrays': false }],
'object-curly-spacing': [ 'error', 'always' ],

// Override some eslint base rules because we're using node.
'no-console': 'off',
}
};
94 changes: 44 additions & 50 deletions api/hosts-api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ credentialsAPI.delete({
return;
}

hosts.resetOAuth2ClientSecret(host, (error) => {
hosts.resetOAuth2ClientSecret(host, error => {
if (error) {
response.statusCode = 500; // Internal Server Error
response.json({ error: 'Could not reset host credentials' }, null, 2);
Expand All @@ -292,7 +292,7 @@ hostAPI.get('/images', {
title: 'List host images',
description: 'List the Docker images available on this host.',

handler: (request, response) => {
handler: async (request, response) => {
const { user } = request;
if (!users.isAdmin(user)) {
response.statusCode = 404; // Not Found
Expand All @@ -307,15 +307,15 @@ hostAPI.get('/images', {
return;
}

docker.listImages({ host: hostname }, (error, images) => {
if (error) {
log('[fail] host images', error);
response.statusCode = 503; // Service Unavailable
response.json({ error: 'Host unreachable' }, null, 2);
return;
}
try {
const images = await docker.listImages({ host: hostname });

response.json(images, null, 2);
});
} catch (error) {
log('[fail] host images', error);
response.statusCode = 503; // Service Unavailable
response.json({ error: 'Host unreachable' }, null, 2);
}
},

examples: [],
Expand All @@ -324,7 +324,7 @@ hostAPI.get('/images', {
hostAPI.get('/version', {
title: 'Show host version',

handler: (request, response) => {
handler: async (request, response) => {
const { user } = request;
if (!users.isAdmin(user)) {
response.statusCode = 404; // Not Found
Expand All @@ -339,15 +339,14 @@ hostAPI.get('/version', {
return;
}

docker.version({ host: hostname }, (error, version) => {
if (error) {
log('[fail] host version', error);
response.statusCode = 503; // Service Unavailable
response.json({ error: 'Host unreachable' }, null, 2);
return;
}
try {
const version = await docker.version({ host: hostname });
response.json({ docker: version }, null, 2);
});
} catch (error) {
log('[fail] host version', error);
response.statusCode = 503; // Service Unavailable
response.json({ error: 'Host unreachable' }, null, 2);
}
},

examples: [{
Expand Down Expand Up @@ -375,7 +374,7 @@ containersAPI.get({
title: 'List containers',
description: 'List all Docker containers on this host.',

handler: (request, response) => {
handler: async (request, response) => {
const { user } = request;
if (!users.isAdmin(user)) {
response.statusCode = 404; // Not Found
Expand All @@ -390,15 +389,14 @@ containersAPI.get({
return;
}

docker.listContainers({ host: hostname }, (error, containers) => {
if (error) {
log('[fail] host containers', error);
response.statusCode = 503; // Service Unavailable
response.json({ error: 'Host unreachable' }, null, 2);
return;
}
try {
const containers = await docker.listContainers({ host: hostname });
response.json(containers, null, 2);
});
} catch (error) {
log('[fail] host containers', error);
response.statusCode = 503; // Service Unavailable
response.json({ error: 'Host unreachable' }, null, 2);
}
},

examples: [],
Expand All @@ -407,7 +405,7 @@ containersAPI.get({
containersAPI.put({
title: 'Create a container',

handler (request, response) {
async handler (request, response) {
const { user } = request;
if (!user) {
response.statusCode = 403; // Forbidden
Expand All @@ -422,17 +420,15 @@ containersAPI.put({
return;
}

machines.spawn(user, projectId, (error, machine) => {
if (error) {
log('[fail] could not spawn machine', error);
response.statusCode = 500; // Internal Server Error
response.json({ error: 'Could not create new container' }, null, 2);
return;
}

try {
const machine = await machines.spawn(user, projectId);
response.statusCode = 201; // Created
response.json({ container: machine.docker.container }, null, 2);
});
} catch (error) {
log('[fail] could not spawn machine', error);
response.statusCode = 500; // Internal Server Error
response.json({ error: 'Could not create new container' }, null, 2);
}
},

examples: []
Expand Down Expand Up @@ -581,10 +577,10 @@ containerAPI.delete({
containerAPI.get('/changes', {
title: 'List changed files in a container',
description:
'List all files that were modified (Kind: 0), added (1) or deleted (2) ' +
'in a given Docker container.',
'List all files that were modified (Kind: 0), added (1) or deleted (2) ' +
'in a given Docker container.',

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Please re-indent these two lines.

handler: (request, response) => {
handler: async (request, response) => {
const { user } = request;
if (!user) {
response.statusCode = 403; // Forbidden
Expand All @@ -609,16 +605,14 @@ containerAPI.get('/changes', {
}

const parameters = { host: hostname, container };
docker.listChangedFilesInContainer(parameters, (error, changedFiles) => {
if (error) {
log('[fail] container changes', error);
response.statusCode = 503; // Service Unavailable
response.json({ error: 'Host unreachable' }, null, 2);
return;
}

try {
const changedFiles = await docker.listChangedFilesInContainer(parameters);
response.json(changedFiles, null, 2);
});
} catch (error) {
log('[fail] container changes', error);
response.statusCode = 503; // Service Unavailable
response.json({ error: 'Host unreachable' }, null, 2);
}
},

examples: [{
Expand Down
Loading