ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-04-18 00:06:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix coffee-script lint failures

Browse Source
This commit is contained in:
Pagan Gazzard 2018-11-02 14:15:01 +00:00
parent e788c630fb
commit d6e9283a15
12 changed files with 77 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/application-manager.coffee
View File

@ -810,9 +810,9 @@ module.exports = class ApplicationManager extends EventEmitter
img = _.find(available, { dockerImageId: service.config.image, imageId: service.imageId }) ? _.find(available, { dockerImageId: service.config.image })
return _.omit(img, [ 'dockerImageId', 'id' ])
allImageDockerIdsForTargetApp = (app) ->
_(app.services).map((svc) -> [ svc.imageName, svc.config.image ])
.filter((img) -> img[1]?)
.value()
_(app.services).map((svc) -> [ svc.imageName, svc.config.image ])
.filter((img) -> img[1]?)
.value()
availableWithoutIds = _.map(available, (image) -> _.omit(image, [ 'dockerImageId', 'id' ]))
currentImages = _.flatMap(current.local.apps, allImagesForCurrentApp)

6
src/compose/service-manager.coffee
View File

@ -239,9 +239,9 @@ module.exports = class ServiceManager extends EventEmitter
wait = ->
Promise.any _.map handoverCompletePaths, (file) ->
fs.statAsync(file)
.then ->
fs.unlinkAsync(file).catch(_.noop)
fs.statAsync(file)
.then ->
fs.unlinkAsync(file).catch(_.noop)
.catch ->
if Date.now() < deadline
Promise.delay(pollInterval).then(wait)

13
src/device-state.coffee
View File

@ -258,7 +258,6 @@ module.exports = class DeviceState extends EventEmitter
@config.get('apiEndpoint'),
validateState(target),
(apiEndpoint) =>
source = apiEndpoint
@usingWriteLockTarget =>
# Apps, deviceConfig, dependent
@db.transaction (trx) =>
@ -318,9 +317,9 @@ module.exports = class DeviceState extends EventEmitter
_.assign(@_currentVolatile, newState)
@emitAsync('change')
_convertLegacyAppsJson: (appsArray) =>
Promise.try =>
deviceConf = _.reduce(appsArray, (conf, app) =>
_convertLegacyAppsJson: (appsArray) ->
Promise.try ->
deviceConf = _.reduce(appsArray, (conf, app) ->
return _.merge({}, conf, app.config)
, {})
apps = _.keyBy(_.map(appsArray, singleToMulticontainerApp), 'appId')
@ -333,9 +332,9 @@ module.exports = class DeviceState extends EventEmitter
.then(JSON.parse)
.then (stateFromFile) =>
if _.isArray(stateFromFile)
# This is a legacy apps.json
console.log('Legacy apps.json detected')
return @_convertLegacyAppsJson(stateFromFile)
# This is a legacy apps.json
console.log('Legacy apps.json detected')
return @_convertLegacyAppsJson(stateFromFile)
else
return stateFromFile
.then (stateFromFile) =>

2
src/lib/docker-utils.coffee
View File

@ -78,7 +78,7 @@ module.exports = class DockerUtils extends DockerToolbelt
# Since the supervisor never calls this function without a source anymore,
# this should never happen, but we handle it anyways.
if !deltaSource?
log("Falling back to regular pull due to lack of a delta source")
log('Falling back to regular pull due to lack of a delta source')
return @fetchImageWithProgress(imgDest, fullDeltaOpts, onProgress)
docker = this

2
src/supervisor.coffee
View File

@ -7,7 +7,7 @@ APIBinder = require './api-binder'
DeviceState = require './device-state'
SupervisorAPI = require './supervisor-api'
{ Logger } = require './logger'
{ checkTruthy } = require './lib/validation';
{ checkTruthy } = require './lib/validation'
constants = require './lib/constants'

34
test/04-service.spec.coffee
View File

@ -7,14 +7,14 @@ _ = require 'lodash'
configs = {
simple: {
compose: require('./data/docker-states/simple/compose.json');
imageInfo: require('./data/docker-states/simple/imageInfo.json');
inspect: require('./data/docker-states/simple/inspect.json');
compose: require('./data/docker-states/simple/compose.json')
imageInfo: require('./data/docker-states/simple/imageInfo.json')
inspect: require('./data/docker-states/simple/inspect.json')
}
entrypoint: {
compose: require('./data/docker-states/entrypoint/compose.json');
imageInfo: require('./data/docker-states/entrypoint/imageInfo.json');
inspect: require('./data/docker-states/entrypoint/inspect.json');
compose: require('./data/docker-states/entrypoint/compose.json')
imageInfo: require('./data/docker-states/entrypoint/imageInfo.json')
inspect: require('./data/docker-states/entrypoint/inspect.json')
}
}
@ -199,8 +199,8 @@ describe 'compose/service', ->
serviceId: 123456,
serviceName: 'test',
ports: [
"80:80"
"100:100"
'80:80'
'100:100'
]
}, { appName: 'test' })
@ -302,14 +302,14 @@ describe 'compose/service', ->
}, { appName: 'test' })
expect(makeComposeServiceWithNetwork({
"balena": {
"ipv4Address": "1.2.3.4"
'balena': {
'ipv4Address': '1.2.3.4'
}
}).toDockerContainer({ deviceName: 'foo' }).NetworkingConfig).to.deep.equal({
EndpointsConfig: {
"123456_balena": {
'123456_balena': {
IPAMConfig: {
IPV4Address: "1.2.3.4"
IPV4Address: '1.2.3.4'
},
Aliases: []
}
@ -325,7 +325,7 @@ describe 'compose/service', ->
}
}).toDockerContainer({ deviceName: 'foo' }).NetworkingConfig).to.deep.equal({
EndpointsConfig: {
"123456_balena": {
'123456_balena': {
IPAMConfig: {
IPV4Address: '1.2.3.4'
IPV6Address: '5.6.7.8'
@ -337,23 +337,23 @@ describe 'compose/service', ->
})
it 'should correctly convert Docker format to service format', ->
dockerCfg = require('./data/docker-states/simple/inspect.json');
dockerCfg = require('./data/docker-states/simple/inspect.json')
makeServiceFromDockerWithNetwork = (networks) ->
Service.fromDockerContainer(
newConfig = _.cloneDeep(dockerCfg);
newConfig = _.cloneDeep(dockerCfg)
newConfig.NetworkSettings = { Networks: networks }
)
expect(makeServiceFromDockerWithNetwork({
'123456_balena': {
IPAMConfig: {
IPv4Address: "1.2.3.4"
IPv4Address: '1.2.3.4'
},
Aliases: []
}
}).config.networks).to.deep.equal({
'123456_balena': {
"ipv4Address": "1.2.3.4"
'ipv4Address': '1.2.3.4'
}
})

2
test/05-device-state.spec.coffee
View File

@ -225,7 +225,7 @@ describe 'deviceState', ->
@deviceState.loadTargetFromFile(process.env.ROOT_MOUNTPOINT + '/apps.json')
.then =>
@deviceState.getTarget()
.then (targetState) =>
.then (targetState) ->
testTarget = _.cloneDeep(testTarget1)
testTarget.local.apps['1234'].services = _.map testTarget.local.apps['1234'].services, (s) ->
s.imageName = s.image

30
test/09-event-tracker.spec.coffee
View File

@ -95,33 +95,33 @@ describe 'EventTracker', ->
it 'should rate limit events of the same type', ->
@eventTracker.client.track.reset()
@eventTracker.track('test', { });
@eventTracker.track('test', { });
@eventTracker.track('test', { });
@eventTracker.track('test', { });
@eventTracker.track('test', { });
@eventTracker.track('test', {})
@eventTracker.track('test', {})
@eventTracker.track('test', {})
@eventTracker.track('test', {})
@eventTracker.track('test', {})
expect(@eventTracker.client.track).to.have.callCount(1)
it 'should rate limit events of the same type with different arguments', ->
@eventTracker.client.track.reset()
@eventTracker.track('test2', { a: 1 });
@eventTracker.track('test2', { b: 2 });
@eventTracker.track('test2', { c: 3 });
@eventTracker.track('test2', { d: 4 });
@eventTracker.track('test2', { e: 5 });
@eventTracker.track('test2', { a: 1 })
@eventTracker.track('test2', { b: 2 })
@eventTracker.track('test2', { c: 3 })
@eventTracker.track('test2', { d: 4 })
@eventTracker.track('test2', { e: 5 })
expect(@eventTracker.client.track).to.have.callCount(1)
it 'should not rate limit events of different types', ->
@eventTracker.client.track.reset()
@eventTracker.track('test3', { a: 1 });
@eventTracker.track('test4', { b: 2 });
@eventTracker.track('test5', { c: 3 });
@eventTracker.track('test6', { d: 4 });
@eventTracker.track('test7', { e: 5 });
@eventTracker.track('test3', { a: 1 })
@eventTracker.track('test4', { b: 2 })
@eventTracker.track('test5', { c: 3 })
@eventTracker.track('test6', { d: 4 })
@eventTracker.track('test7', { e: 5 })
expect(@eventTracker.client.track).to.have.callCount(5)

6
test/12-logger.spec.coffee
View File

@ -26,7 +26,7 @@ describe 'Logger', ->
track: m.sinon.spy()
}
@logger = new Logger({eventTracker: @fakeEventTracker})
@logger = new Logger({ eventTracker: @fakeEventTracker })
@logger.init({
apiEndpoint: 'https://example.com'
uuid: 'deadbeef'
@ -41,7 +41,7 @@ describe 'Logger', ->
it 'waits the grace period before sending any logs', ->
clock = m.sinon.useFakeTimers()
@logger.log({message: 'foobar', serviceId: 15})
@logger.log({ message: 'foobar', serviceId: 15 })
clock.tick(4999)
clock.restore()
@ -51,7 +51,7 @@ describe 'Logger', ->
it 'tears down the connection after inactivity', ->
clock = m.sinon.useFakeTimers()
@logger.log({message: 'foobar', serviceId: 15})
@logger.log({ message: 'foobar', serviceId: 15 })
clock.tick(61000)
clock.restore()

16
test/13-device-config.spec.coffee
View File

@ -150,20 +150,20 @@ describe 'DeviceConfig', ->
it 'accepts RESIN_ and BALENA_ variables', ->
@deviceConfig.formatConfigKeys({
FOO: 'bar',
BAR: 'baz',
RESIN_HOST_CONFIG_foo: 'foobaz',
BALENA_HOST_CONFIG_foo: 'foobar',
RESIN_HOST_CONFIG_other: 'val',
BALENA_HOST_CONFIG_baz: 'bad',
BALENA_SUPERVISOR_POLL_INTERVAL: '100',
FOO: 'bar',
BAR: 'baz',
RESIN_HOST_CONFIG_foo: 'foobaz',
BALENA_HOST_CONFIG_foo: 'foobar',
RESIN_HOST_CONFIG_other: 'val',
BALENA_HOST_CONFIG_baz: 'bad',
BALENA_SUPERVISOR_POLL_INTERVAL: '100',
}).then (filteredConf) ->
expect(filteredConf).to.deep.equal({
HOST_CONFIG_foo: 'foobar',
HOST_CONFIG_other: 'val',
HOST_CONFIG_baz: 'bad',
SUPERVISOR_POLL_INTERVAL: '100',
});
})
describe 'Extlinux files', ->

32
test/18-compose-network.coffee
View File

@ -10,13 +10,13 @@ describe 'compose/network', ->
it 'should convert a compose configuration to an internal representation', ->
network = Network.fromComposeObject({ logger: null, docker: null }, 'test', 123, {
'driver':'bridge',
'ipam':{
'driver':'default',
'config':[
'driver': 'bridge',
'ipam': {
'driver': 'default',
'config': [
{
'subnet':'172.25.0.0/25',
'gateway':'172.25.0.1'
'subnet': '172.25.0.0/25',
'gateway': '172.25.0.1'
}
]
}
@ -30,12 +30,12 @@ describe 'compose/network', ->
subnet: '172.25.0.0/25'
gateway: '172.25.0.1'
]
options: { }
options: {}
}
enableIPv6: false,
internal: false,
labels: { }
options: { }
labels: {}
options: {}
})
describe 'internal config -> docker config', ->
@ -43,13 +43,13 @@ describe 'compose/network', ->
it 'should convert an internal representation to a docker representation', ->
network = Network.fromComposeObject({ logger: null, docker: null }, 'test', 123, {
'driver':'bridge',
'ipam':{
'driver':'default',
'config':[
'driver': 'bridge',
'ipam': {
'driver': 'default',
'config': [
{
'subnet':'172.25.0.0/25',
'gateway':'172.25.0.1'
'subnet': '172.25.0.0/25',
'gateway': '172.25.0.1'
}
]
}
@ -65,7 +65,7 @@ describe 'compose/network', ->
Subnet: '172.25.0.0/25'
Gateway: '172.25.0.1'
}]
Options: { }
Options: {}
}
EnableIPv6: false,
Internal: false,

6
test/19-compose-utils.coffee
View File

@ -1,8 +1,8 @@
require('mocha');
require('mocha')
{ expect } = require('chai');
{ expect } = require('chai')
ComposeUtils = require('../src/compose/utils');
ComposeUtils = require('../src/compose/utils')
describe 'Composition utilities', ->