updated central-common + skip failing registry in stack

PHT-Medic · Mar 30, 2022 · f0827da · f0827da
1 parent 9db5100
commit f0827da
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 43 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,8 +21,9 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@personalhealthtrain/central-common": "^1.3.15",
+        "@personalhealthtrain/central-common": "^1.3.24",
         "@trapi/client": "^2.0.5",
+        "@typescript-error/core": "^1.1.3",
         "@authelion/common": "^0.0.3",
         "chalk": "^4.1.2",
         "docker-scan": "^1.0.4",

diff --git a/src/index.ts b/src/index.ts
@@ -208,38 +208,42 @@ for (let i = 0; i < sum; i++) {
                 password: registries[i].password,
             };
 
-            for (let j = 0; j < images.length; j++) {
-                const repository = `${registries[i].host}/${images[j]}:latest`;
-                const image = docker.getImage(repository);
-
-                const stream = await image.push({
-                    authconfig: authConfig,
-                });
-
-                spinner.start(`Push: ${repository}`);
-
-                pushPromises.push(new Promise((resolve, reject) => {
-                    docker.modem.followProgress(
-                        stream,
-                        (err: Error, res: any[]) => {
-                            if (err) {
-                                return reject(err);
-                            }
+            try {
+                for (let j = 0; j < images.length; j++) {
+                    const repository = `${registries[i].host}/${images[j]}:latest`;
+                    const image = docker.getImage(repository);
+
+                    const stream = await image.push({
+                        authconfig: authConfig,
+                    });
+
+                    spinner.start(`Push: ${repository}`);
+
+                    pushPromises.push(new Promise((resolve, reject) => {
+                        docker.modem.followProgress(
+                            stream,
+                            (err: Error, res: any[]) => {
+                                if (err) {
+                                    return reject(err);
+                                }
 
-                            const raw = res.pop();
+                                const raw = res.pop();
 
-                            if (Object.prototype.toString.call(raw) === '[object Object]') {
-                                if (typeof raw?.errorDetail?.message === 'string') {
-                                    return reject(new Error(raw.errorDetail.message));
+                                if (Object.prototype.toString.call(raw) === '[object Object]') {
+                                    if (typeof raw?.errorDetail?.message === 'string') {
+                                        return reject(new Error(raw.errorDetail.message));
+                                    }
                                 }
-                            }
 
-                            spinner.info(`Pushed: ${repository}`);
+                                spinner.info(`Pushed: ${repository}`);
 
-                            return resolve(res);
-                        },
-                    );
-                }));
+                                return resolve(res);
+                            },
+                        );
+                    }));
+                }
+            } catch (e) {
+                spinner.fail(`Push to registry ${registries[i].host} failed`);
             }
         }
 

diff --git a/src/utils/ui.ts → src/utils/api.ts b/src/utils/ui.ts → src/utils/api.ts
@@ -10,11 +10,11 @@ import { ScanResult } from 'docker-scan';
 import {
     MasterImageAPI,
     MasterImageCommand,
-    parseHarborConnectionString,
 } from '@personalhealthtrain/central-common';
 import { TokenAPI } from '@authelion/common';
 import { Ora } from 'ora';
 import { requireFromEnv } from './env';
+import { parseConnectionString } from './connection-string';
 
 export async function syncScanResultToCentralAPI(context: {
     scan: ScanResult,
@@ -23,7 +23,7 @@ export async function syncScanResultToCentralAPI(context: {
     context.spinner.start('Try to push meta information to central-api');
 
     try {
-        const connection = parseHarborConnectionString(requireFromEnv('CENTRAL_API_CONNECTION_STRING'));
+        const connection = parseConnectionString(requireFromEnv('CENTRAL_API_CONNECTION_STRING'));
 
         setConfig({
             driver: {

diff --git a/src/utils/connection-string.ts b/src/utils/connection-string.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022.
+ * Author Peter Placzek (tada5hi)
+ * For the full copyright and license information,
+ * view the LICENSE file that was distributed with this source code.
+ */
+
+import { BaseError } from '@typescript-error/core';
+
+export function parseConnectionString(connectionString: string): {
+    host: string,
+    user: string,
+    password: string
+} {
+    const parts: string[] = connectionString.split('@');
+    if (parts.length !== 2) {
+        throw new BaseError('Connection string must be in the following format: user:password@host');
+    }
+
+    const host: string = parts[1];
+
+    const authParts: string[] = parts[0].split(':');
+    if (authParts.length !== 2) {
+        throw new BaseError('Connection string must be in the following format: user:password@host');
+    }
+
+    return {
+        host,
+        user: authParts[0],
+        password: authParts[1],
+    };
+}
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -5,5 +5,6 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
-export * from './ui';
+export * from './api';
+export * from './connection-string';
 export * from './env';