From 83c49a6234d1694f698a396f9d7825961a3a18ce Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Fri, 13 Sep 2019 18:20:12 +0200 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 12 +++++------ package.json | 2 +- test/test.ts | 5 ++--- ts/docker.classes.host.ts | 5 ++--- ts/docker.classes.image.ts | 6 +----- ts/docker.classes.secret.ts | 39 ++++++++++++++++++++++-------------- ts/docker.classes.service.ts | 2 +- ts/docker.plugins.ts | 17 ++++++++++++---- ts/interfaces/secret.ts | 2 +- 9 files changed, 50 insertions(+), 40 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index baf29ac..ac532d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,13 +38,11 @@ snyk: # test stage # ==================== -testLTS: - services: - - docker:18-dind +testStable: stage: test script: - npmci npm prepare - - npmci node install lts + - npmci node install stable - npmci npm install - npmci npm test coverage: /\d+.?\d+?\%\s*coverage/ @@ -56,7 +54,7 @@ testBuild: stage: test script: - npmci npm prepare - - npmci node install lts + - npmci node install stable - npmci npm install - npmci command npm run build coverage: /\d+.?\d+?\%\s*coverage/ @@ -67,7 +65,7 @@ testBuild: release: stage: release script: - - npmci node install lts + - npmci node install stable - npmci npm publish only: - tags @@ -102,7 +100,7 @@ trigger: pages: image: hosttoday/ht-docker-dbase:npmci services: - - docker:18-dind + - docker:stable-dind stage: metadata script: - npmci command npm install -g @gitzone/tsdoc diff --git a/package.json b/package.json index f953f14..52cae59 100644 --- a/package.json +++ b/package.json @@ -59,4 +59,4 @@ "npmextra.json", "readme.md" ] -} +} \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index 605d08e..acef05e 100644 --- a/test/test.ts +++ b/test/test.ts @@ -72,7 +72,6 @@ tap.test('should remove a secret by name', async () => { await mySecret.remove(); }); - // SERVICES tap.test('should activate swarm mode', async () => { await testDockerHost.activateSwarm(); @@ -98,8 +97,8 @@ tap.test('should create a service', async () => { }); const testService = await docker.DockerService.createService(testDockerHost, { image: testImage, - labels: { - 'testlabel': 'hi' + labels: { + testlabel: 'hi' }, name: 'testService', networks: [testNetwork], diff --git a/ts/docker.classes.host.ts b/ts/docker.classes.host.ts index 8ea35dc..1ca6db9 100644 --- a/ts/docker.classes.host.ts +++ b/ts/docker.classes.host.ts @@ -47,7 +47,7 @@ export class DockerHost { /** * sets an auth token - * @param authToken + * @param authToken */ public setAuthToken(authToken: string) { this.registryToken = authToken; @@ -70,10 +70,9 @@ export class DockerHost { } /** - * + * */ - /** * gets all containers */ diff --git a/ts/docker.classes.image.ts b/ts/docker.classes.image.ts index f2c04b4..98cefe8 100644 --- a/ts/docker.classes.image.ts +++ b/ts/docker.classes.image.ts @@ -21,7 +21,6 @@ export class DockerImage { } else { return false; } - }); return result; } @@ -30,7 +29,6 @@ export class DockerImage { dockerHostArg: DockerHost, creationObject: interfaces.IImageCreationDescriptor ): Promise { - // lets create a sanatized imageUrlObject const imageUrlObject: { imageUrl: string; @@ -46,9 +44,7 @@ export class DockerImage { const imageTag = imageUrlObject.imageUrl.split(':')[1]; if (imageUrlObject.imageTag) { throw new Error( - `imageUrl ${imageUrlObject.imageUrl} can't be tagged with ${ - imageUrlObject.imageTag - } because it is already tagged with ${imageTag}` + `imageUrl ${imageUrlObject.imageUrl} can't be tagged with ${imageUrlObject.imageTag} because it is already tagged with ${imageTag}` ); } else { imageUrlObject.imageUrl = imageUrl; diff --git a/ts/docker.classes.secret.ts b/ts/docker.classes.secret.ts index df89a71..8dddd18 100644 --- a/ts/docker.classes.secret.ts +++ b/ts/docker.classes.secret.ts @@ -17,17 +17,20 @@ export class DockerSecret { return secrets; } - public static async getSecretByID (dockerHostArg: DockerHost, idArg: string) { + public static async getSecretByID(dockerHostArg: DockerHost, idArg: string) { const secrets = await this.getSecrets(dockerHostArg); return secrets.find(secret => secret.ID === idArg); } - public static async getSecretByName (dockerHostArg: DockerHost, nameArg: string) { + public static async getSecretByName(dockerHostArg: DockerHost, nameArg: string) { const secrets = await this.getSecrets(dockerHostArg); return secrets.find(secret => secret.Spec.Name === nameArg); } - public static async createSecret(dockerHostArg: DockerHost, secretDescriptor: interfaces.ISecretCreationDescriptor) { + public static async createSecret( + dockerHostArg: DockerHost, + secretDescriptor: interfaces.ISecretCreationDescriptor + ) { const labels: interfaces.TLabels = { ...secretDescriptor.labels, version: secretDescriptor.version @@ -37,10 +40,13 @@ export class DockerSecret { Labels: labels, Data: plugins.smartstring.base64.encode(secretDescriptor.contentArg) }); - + const newSecretInstance = new DockerSecret(dockerHostArg); Object.assign(newSecretInstance, response.body); - Object.assign (newSecretInstance, await DockerSecret.getSecretByID(dockerHostArg, newSecretInstance.ID)); + Object.assign( + newSecretInstance, + await DockerSecret.getSecretByID(dockerHostArg, newSecretInstance.ID) + ); return newSecretInstance; } @@ -51,7 +57,7 @@ export class DockerSecret { Labels: interfaces.TLabels; }; public Version: { - Index:string; + Index: string; }; public dockerHost: DockerHost; @@ -62,22 +68,25 @@ export class DockerSecret { /** * updates a secret */ - public async update (contentArg: string) { + public async update(contentArg: string) { const route = `/secrets/${this.ID}/update?=version=${this.Version.Index}`; - const response = await this.dockerHost.request('POST', `/secrets/${this.ID}/update?version=${this.Version.Index}`, { - Name: this.Spec.Name, - Labels: this.Spec.Labels, - Data: plugins.smartstring.base64.encode(contentArg) - }); + const response = await this.dockerHost.request( + 'POST', + `/secrets/${this.ID}/update?version=${this.Version.Index}`, + { + Name: this.Spec.Name, + Labels: this.Spec.Labels, + Data: plugins.smartstring.base64.encode(contentArg) + } + ); } - public async remove () { + public async remove() { await this.dockerHost.request('DELETE', `/secrets/${this.ID}`); } - // get things public async getVersion() { return this.Spec.Labels.version; } -} \ No newline at end of file +} diff --git a/ts/docker.classes.service.ts b/ts/docker.classes.service.ts index 5849736..b5fff1b 100644 --- a/ts/docker.classes.service.ts +++ b/ts/docker.classes.service.ts @@ -41,7 +41,7 @@ export class DockerService { 'info', `now creating service ${serviceCreationDescriptor.name}` ); - + // await serviceCreationDescriptor.image.pullLatestImageFromRegistry(); const serviceVersion = await serviceCreationDescriptor.image.getVersion(); diff --git a/ts/docker.plugins.ts b/ts/docker.plugins.ts index fd24107..5761241 100644 --- a/ts/docker.plugins.ts +++ b/ts/docker.plugins.ts @@ -1,9 +1,7 @@ // node native path import * as path from 'path'; -export { - path -}; +export { path }; // @pushrocks scope import * as lik from '@pushrocks/lik'; @@ -19,7 +17,18 @@ import * as smartversion from '@pushrocks/smartversion'; smartlog.defaultLogger.enableConsole(); -export { lik, smartfile, smartjson, smartlog, smartnetwork, smartpath, smartpromise, smartrequest, smartstring, smartversion }; +export { + lik, + smartfile, + smartjson, + smartlog, + smartnetwork, + smartpath, + smartpromise, + smartrequest, + smartstring, + smartversion +}; // third party import * as rxjs from 'rxjs'; diff --git a/ts/interfaces/secret.ts b/ts/interfaces/secret.ts index 246b967..6cf9b66 100644 --- a/ts/interfaces/secret.ts +++ b/ts/interfaces/secret.ts @@ -5,4 +5,4 @@ export interface ISecretCreationDescriptor { version: string; contentArg: any; labels: interfaces.TLabels; -} \ No newline at end of file +}