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

Upgrade TypedError and move docker-utils error to error module

Browse Source 
Change-type: patch
Signed-off-by: Cameron Diver <cameron@resin.io>
This commit is contained in:
Cameron Diver 2018-06-13 16:55:34 +01:00
parent b9a16c067b
commit 31c6db2ccd
No known key found for this signature in database
GPG Key ID: 69264F9C923F55C1
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -72,7 +72,7 @@
"shell-quote": "^1.6.1", "shell-quote": "^1.6.1",
"ts-loader": "^3.5.0", "ts-loader": "^3.5.0",
"ts-node": "^6.0.1", "ts-node": "^6.0.1",
"typed-error": "~0.1.0", "typed-error": "^2.0.0",
"typescript": "^2.8.3", "typescript": "^2.8.3",
"uglifyjs-webpack-plugin": "^1.0.1", "uglifyjs-webpack-plugin": "^1.0.1",
"versionist": "^2.8.0", "versionist": "^2.8.0",

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

@ -3,10 +3,10 @@ DockerToolbelt = require 'docker-toolbelt'
{ DockerProgress } = require 'docker-progress' { DockerProgress } = require 'docker-progress'
Promise = require 'bluebird' Promise = require 'bluebird'
dockerDelta = require 'docker-delta' dockerDelta = require 'docker-delta'
TypedError = require 'typed-error'
_ = require 'lodash' _ = require 'lodash'
{ request, resumable } = require './request' { request, resumable } = require './request'
{ envArrayToObject } = require './conversions' { envArrayToObject } = require './conversions'
{ InvalidNetGatewayError } = require './errors'
{ checkInt } = require './validation' { checkInt } = require './validation'
applyRsyncDelta = (imgSrc, deltaUrl, applyTimeout, opts, onProgress, log) -> applyRsyncDelta = (imgSrc, deltaUrl, applyTimeout, opts, onProgress, log) ->
@ -36,7 +36,7 @@ applyBalenaDelta = (docker, deltaImg, token, onProgress, log) ->
log('Using registry auth token') log('Using registry auth token')
auth = { authconfig: registrytoken: token } auth = { authconfig: registrytoken: token }
docker.dockerProgress.pull(deltaImg, onProgress, auth) docker.dockerProgress.pull(deltaImg, onProgress, auth)
.then => .then ->
docker.getImage(deltaImg).inspect().get('Id') docker.getImage(deltaImg).inspect().get('Id')
module.exports = class DockerUtils extends DockerToolbelt module.exports = class DockerUtils extends DockerToolbelt
@ -45,8 +45,6 @@ module.exports = class DockerUtils extends DockerToolbelt
@dockerProgress = new DockerProgress(dockerToolbelt: this) @dockerProgress = new DockerProgress(dockerToolbelt: this)
@supervisorTagPromise = @normaliseImageName(constants.supervisorImage) @supervisorTagPromise = @normaliseImageName(constants.supervisorImage)
InvalidNetGatewayError: class InvalidNetGatewayError extends TypedError
getRepoAndTag: (image) => getRepoAndTag: (image) =>
@getRegistryAndName(image) @getRegistryAndName(image)
.then ({ registry, imageName, tagName }) -> .then ({ registry, imageName, tagName }) ->
@ -158,8 +156,8 @@ module.exports = class DockerUtils extends DockerToolbelt
getNetworkGateway: (netName) => getNetworkGateway: (netName) =>
return Promise.resolve('127.0.0.1') if netName == 'host' return Promise.resolve('127.0.0.1') if netName == 'host'
@getNetwork(netName).inspect() @getNetwork(netName).inspect()
.then (netInfo) => .then (netInfo) ->
conf = netInfo?.IPAM?.Config?[0] conf = netInfo?.IPAM?.Config?[0]
return conf.Gateway if conf?.Gateway? return conf.Gateway if conf?.Gateway?
return conf.Subnet.replace('.0/16', '.1') if _.endsWith(conf?.Subnet, '.0/16') return conf.Subnet.replace('.0/16', '.1') if _.endsWith(conf?.Subnet, '.0/16')
throw new @InvalidNetGatewayError("Cannot determine network gateway for #{netName}") throw new InvalidNetGatewayError("Cannot determine network gateway for #{netName}")

3
src/lib/errors.ts
View File

@ -1,4 +1,5 @@
import { endsWith } from 'lodash'; import { endsWith } from 'lodash';
import TypedError = require('typed-error');
import { checkInt } from './validation'; import { checkInt } from './validation';
@ -17,3 +18,5 @@ export function EEXIST(err: { code: string, [key: string]: any }): boolean {
export function UnitNotLoadedError(err: string[]): boolean { export function UnitNotLoadedError(err: string[]): boolean {
return endsWith(err[0], 'not loaded.'); return endsWith(err[0], 'not loaded.');
} }
export class InvalidNetGatewayError extends TypedError { }