From 31c6db2ccdf75c1e64dd7ecf0562fcfde4aac4aa Mon Sep 17 00:00:00 2001 From: Cameron Diver Date: Wed, 13 Jun 2018 16:55:34 +0100 Subject: [PATCH] Upgrade TypedError and move docker-utils error to error module Change-type: patch Signed-off-by: Cameron Diver --- package.json | 2 +- src/lib/docker-utils.coffee | 10 ++++------ src/lib/errors.ts | 3 +++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 9476b1ee..111fd322 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "shell-quote": "^1.6.1", "ts-loader": "^3.5.0", "ts-node": "^6.0.1", - "typed-error": "~0.1.0", + "typed-error": "^2.0.0", "typescript": "^2.8.3", "uglifyjs-webpack-plugin": "^1.0.1", "versionist": "^2.8.0", diff --git a/src/lib/docker-utils.coffee b/src/lib/docker-utils.coffee index f89cc553..ad48102c 100644 --- a/src/lib/docker-utils.coffee +++ b/src/lib/docker-utils.coffee @@ -3,10 +3,10 @@ DockerToolbelt = require 'docker-toolbelt' { DockerProgress } = require 'docker-progress' Promise = require 'bluebird' dockerDelta = require 'docker-delta' -TypedError = require 'typed-error' _ = require 'lodash' { request, resumable } = require './request' { envArrayToObject } = require './conversions' +{ InvalidNetGatewayError } = require './errors' { checkInt } = require './validation' applyRsyncDelta = (imgSrc, deltaUrl, applyTimeout, opts, onProgress, log) -> @@ -36,7 +36,7 @@ applyBalenaDelta = (docker, deltaImg, token, onProgress, log) -> log('Using registry auth token') auth = { authconfig: registrytoken: token } docker.dockerProgress.pull(deltaImg, onProgress, auth) - .then => + .then -> docker.getImage(deltaImg).inspect().get('Id') module.exports = class DockerUtils extends DockerToolbelt @@ -45,8 +45,6 @@ module.exports = class DockerUtils extends DockerToolbelt @dockerProgress = new DockerProgress(dockerToolbelt: this) @supervisorTagPromise = @normaliseImageName(constants.supervisorImage) - InvalidNetGatewayError: class InvalidNetGatewayError extends TypedError - getRepoAndTag: (image) => @getRegistryAndName(image) .then ({ registry, imageName, tagName }) -> @@ -158,8 +156,8 @@ module.exports = class DockerUtils extends DockerToolbelt getNetworkGateway: (netName) => return Promise.resolve('127.0.0.1') if netName == 'host' @getNetwork(netName).inspect() - .then (netInfo) => + .then (netInfo) -> conf = netInfo?.IPAM?.Config?[0] return conf.Gateway if conf?.Gateway? 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}") diff --git a/src/lib/errors.ts b/src/lib/errors.ts index c71e1e9e..2a060a92 100644 --- a/src/lib/errors.ts +++ b/src/lib/errors.ts @@ -1,4 +1,5 @@ import { endsWith } from 'lodash'; +import TypedError = require('typed-error'); import { checkInt } from './validation'; @@ -17,3 +18,5 @@ export function EEXIST(err: { code: string, [key: string]: any }): boolean { export function UnitNotLoadedError(err: string[]): boolean { return endsWith(err[0], 'not loaded.'); } + +export class InvalidNetGatewayError extends TypedError { }