ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-25 08:21:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Style fixes, select() app columns to return in /v1/apps

Browse Source
This commit is contained in:
Kostas Lekkas 2016-04-21 09:51:17 +03:00
parent f76b38eb49
commit 01e39825b4
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/api.coffee
View File

@ -15,12 +15,6 @@ privateAppEnvVars = [
'RESIN_API_KEY' 'RESIN_API_KEY'
] ]
ignoredAppTableColumns = [
'id'
'name'
'privileged'
]
module.exports = (application) -> module.exports = (application) ->
api = express() api = express()
api.use(bodyParser()) api.use(bodyParser())
@ -151,7 +145,7 @@ module.exports = (application) ->
throw new Error('App not found') throw new Error('App not found')
application.kill(app, true, false) application.kill(app, true, false)
.then -> .then ->
res.json(_.pick(app, [ 'containerId' ])) res.json(_.pick(app, 'containerId'))
.catch (err) -> .catch (err) ->
res.status(503).send(err?.message or err or 'Unknown error') res.status(503).send(err?.message or err or 'Unknown error')
@ -167,7 +161,7 @@ module.exports = (application) ->
throw new Error('App not found') throw new Error('App not found')
application.start(app) application.start(app)
.then -> .then ->
res.json(_.pick(app, [ 'containerId' ])) res.json(_.pick(app, 'containerId'))
.catch (err) -> .catch (err) ->
res.status(503).send(err?.message or err or 'Unknown error') res.status(503).send(err?.message or err or 'Unknown error')
@ -177,14 +171,15 @@ module.exports = (application) ->
if !appId? if !appId?
return res.status(400).send('Missing app id') return res.status(400).send('Missing app id')
Promise.using application.lockUpdates(appId, true), -> Promise.using application.lockUpdates(appId, true), ->
knex('app').select().where({ appId }) columns = [ 'appId', 'containerId', 'commit', 'imageId', 'env' ]
knex('app').select(columns).where({ appId })
.then ([ app ]) -> .then ([ app ]) ->
if !app? if !app?
throw new Error('App not found') throw new Error('App not found')
# Don't return keys on the endpoint # Don't return keys on the endpoint
app.env = _.omit(JSON.parse(app.env), privateAppEnvVars) app.env = _.omit(JSON.parse(app.env), privateAppEnvVars)
# Don't return data that will be of no use to the user # Don't return data that will be of no use to the user
res.json(_.omit(app, ignoredAppTableColumns)) res.json(app)
.catch (err) -> .catch (err) ->
res.status(503).send(err?.message or err or 'Unknown error') res.status(503).send(err?.message or err or 'Unknown error')