3.1.82

.gitlab-ci.yml

@@ -12,6 +12,9 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================
@@ -36,6 +39,7 @@ auditProductionDependencies:
     - npmci command npm audit --audit-level=high --only=prod --production
   tags:
     - docker
+  allow_failure: true
 
 auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci

.snyk

@@ -1,4 +0,0 @@
-# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.13.1
-ignore: {}
-patch: {}

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${relativeFile}"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "test.ts",
-      "type": "node",
-      "request": "launch",
-      "args": [
-        "test/test.ts"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
     }
   ]
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipzone/npmci",
-  "version": "3.1.76",
+  "version": "3.1.82",
   "private": false,
   "description": "node and docker in gitlab ci on steroids",
   "main": "dist_ts/index.js",
@@ -24,34 +24,36 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmci#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.28",
-    "@gitzone/tsrun": "^1.2.12",
+    "@gitzone/tsrun": "^1.2.18",
-    "@gitzone/tstest": "^1.0.54",
+    "@gitzone/tstest": "^1.0.59",
     "@pushrocks/tapbundle": "^3.2.14",
-    "@types/node": "^15.0.3",
+    "@types/node": "^16.11.6",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@apiglobal/typedrequest": "^1.0.56",
+    "@apiglobal/typedrequest": "^1.0.58",
-    "@pushrocks/lik": "^4.0.20",
+    "@pushrocks/lik": "^5.0.0",
     "@pushrocks/npmextra": "^3.0.9",
     "@pushrocks/projectinfo": "^4.0.5",
     "@pushrocks/qenv": "^4.0.10",
     "@pushrocks/smartanalytics": "^2.0.15",
     "@pushrocks/smartcli": "^3.0.14",
-    "@pushrocks/smartdelay": "^2.0.10",
+    "@pushrocks/smartdelay": "^2.0.13",
     "@pushrocks/smartfile": "^8.0.10",
-    "@pushrocks/smartlog": "^2.0.39",
+    "@pushrocks/smartgit": "^2.0.1",
+    "@pushrocks/smartlog": "^2.0.44",
     "@pushrocks/smartlog-destination-local": "^8.0.8",
     "@pushrocks/smartparam": "^1.1.6",
-    "@pushrocks/smartpromise": "^3.1.5",
+    "@pushrocks/smartpromise": "^3.1.6",
-    "@pushrocks/smartrequest": "^1.1.51",
+    "@pushrocks/smartrequest": "^1.1.52",
-    "@pushrocks/smartshell": "^2.0.26",
+    "@pushrocks/smartshell": "^2.0.28",
     "@pushrocks/smartsocket": "^1.2.8",
     "@pushrocks/smartssh": "^1.2.3",
     "@pushrocks/smartstring": "^3.0.24",
-    "@servezone/servezone-interfaces": "^2.0.51",
+    "@servezone/interfaces": "^1.0.3",
+    "@tsclass/tsclass": "^3.0.36",
     "@types/through2": "^2.0.36",
     "through2": "^4.0.2"
   },

readme.md

@@ -100,7 +100,6 @@ For further information read the linked docs at the top of this README.
 
 Use TypeScript for best in class instellisense.
 
-
 ## Contribution
 
 We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)

test/test.ts

@@ -2,6 +2,7 @@ import { tap, expect } from '@pushrocks/tapbundle';
 import * as path from 'path';
 
 process.env.NPMTS_TEST = 'true';
+process.env.NPMCI_URL_CLOUDLY = 'localhost'
 
 // set up environment
 process.env.CI_REPOSITORY_URL = 'https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git';

ts/connector.cloudly/cloudlyconnector.ts

@@ -14,7 +14,7 @@ export class CloudlyConnector {
   }
 
   public async announceDockerContainer(
-    optionsArg: plugins.servezoneInterfaces.version.IVersionData
+    optionsArg: plugins.tsclass.container.IContainer
   ) {
     const cloudlyUrl = this.npmciRef.npmciConfig.getConfig().urlCloudly;
     if (!cloudlyUrl) {
@@ -25,11 +25,14 @@ export class CloudlyConnector {
       return;
     }
 
-    const typedrequest = new plugins.typedrequest.TypedRequest<plugins.servezoneInterfaces.request.version.IRequest_Any_Cloudly_VersionManager_Update>(
+    const typedrequest =
-      `https://${cloudlyUrl}/versionmanager`,
+      new plugins.typedrequest.TypedRequest<plugins.servezoneInterfaces.requests.IRequest_InformAboutNewContainerImage>(
-      'update'
+        `https://${cloudlyUrl}/typedrequest`,
-    );
+        'servezonestandard_InformAboutNewContainerVersion'
+      );
 
-    const response = await typedrequest.fire(optionsArg);
+    const response = await typedrequest.fire({
+      containerImageInfo: optionsArg
+    });
   }
 }

ts/manager.docker/index.ts

@@ -21,7 +21,7 @@ export class NpmciDockerManager {
    * handle cli input
    * @param argvArg
    */
-  public handleCli = async (argvArg) => {
+  public handleCli = async (argvArg: any) => {
     if (argvArg._.length >= 2) {
       const action: string = argvArg._[1];
       switch (action) {
@@ -93,7 +93,7 @@ export class NpmciDockerManager {
     await plugins.smartparam.forEachMinimatch(
       process.env,
       'NPMCI_LOGIN_DOCKER*',
-      async (envString) => {
+      async (envString: string) => {
         this.npmciRegistryStorage.addRegistry(DockerRegistry.fromEnvString(envString));
       }
     );
@@ -104,7 +104,7 @@ export class NpmciDockerManager {
    * pushes an image towards a registry
    * @param argvArg
    */
-  public push = async (argvArg) => {
+  public push = async (argvArg: any) => {
     await this.prepare();
     let dockerRegistryUrls: string[] = [];
 
@@ -134,7 +134,9 @@ export class NpmciDockerManager {
       const dockerfileArray = await Dockerfile.readDockerfiles(this)
         .then(Dockerfile.sortDockerfiles)
         .then(Dockerfile.mapDockerfiles);
-      const dockerRegistryToPushTo = this.npmciRegistryStorage.getRegistryByUrl(dockerRegistryUrl);
+      const dockerRegistryToPushTo = await this.npmciRegistryStorage.getRegistryByUrl(
+        dockerRegistryUrl
+      );
       if (!dockerRegistryToPushTo) {
         logger.log(
           'error',
@@ -151,14 +153,14 @@ export class NpmciDockerManager {
   /**
    * pulls an image
    */
-  public pull = async (argvArg) => {
+  public pull = async (argvArg: any) => {
     await this.prepare();
     const registryUrlArg = argvArg._[2];
     let suffix = null;
     if (argvArg._.length >= 4) {
       suffix = argvArg._[3];
     }
-    const localDockerRegistry = this.npmciRegistryStorage.getRegistryByUrl(registryUrlArg);
+    const localDockerRegistry = await this.npmciRegistryStorage.getRegistryByUrl(registryUrlArg);
     const dockerfileArray = await Dockerfile.readDockerfiles(this)
       .then(Dockerfile.sortDockerfiles)
       .then(Dockerfile.mapDockerfiles);

ts/manager.docker/mod.classes.dockerfile.ts

@@ -152,9 +152,8 @@ export class Dockerfile {
     suffixArg?: string
   ): string {
     // determine wether the repo should be mapped accordingly to the registry
-    const mappedRepo = npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerRegistryRepoMap[
+    const mappedRepo =
-      registryArg
+      npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().dockerRegistryRepoMap[registryArg];
-    ];
     const repo = (() => {
       if (mappedRepo) {
         return mappedRepo;
@@ -274,9 +273,11 @@ export class Dockerfile {
     ).split('@')[1];
     console.log(`The image ${this.pushTag} has digest ${imageDigest}`);
     await this.npmciDockerManagerRef.npmciRef.cloudlyConnector.announceDockerContainer({
-      dockerImageUrl: this.pushTag,
+      registryUrl: this.pushTag,
-      dockerImageVersion: this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo
+      tag: this.buildTag,
-        .npm.version,
+      labels: [],
+      version:
+        this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo.npm.version,
     });
   }
 

ts/manager.docker/mod.classes.registrystorage.ts

@@ -15,7 +15,7 @@ export class RegistryStorage {
   }
 
   getRegistryByUrl(registryUrlArg: string) {
-    return this.objectMap.find((registryArg) => {
+    return this.objectMap.findSync((registryArg) => {
       return registryArg.registryUrl === registryUrlArg;
     });
   }

ts/manager.git/index.ts

@@ -14,7 +14,7 @@ export class NpmciGitManager {
    * handle cli input
    * @param argvArg
    */
-  public handleCli = async (argvArg) => {
+  public handleCli = async (argvArg: any) => {
     if (argvArg._.length >= 2) {
       const action: string = argvArg._[1];
       switch (action) {

ts/manager.nodejs/index.ts

@@ -16,7 +16,7 @@ export class NpmciNodeJsManager {
    * handle cli input
    * @param argvArg
    */
-  public async handleCli(argvArg) {
+  public async handleCli(argvArg: any) {
     if (argvArg._.length >= 3) {
       const action: string = argvArg._[1];
       switch (action) {
@@ -40,15 +40,15 @@ export class NpmciNodeJsManager {
    * Install a specific version of node
    * @param versionArg
    */
-  public async install(versionArg) {
+  public async install(versionArg: any) {
     logger.log('info', `now installing node version ${versionArg}`);
     let version: string;
     if (versionArg === 'stable') {
-      version = '12';
+      version = '16';
     } else if (versionArg === 'lts') {
-      version = '10';
+      version = '14';
     } else if (versionArg === 'legacy') {
-      version = '8';
+      version = '12';
     } else {
       version = versionArg;
     }

ts/manager.npm/index.ts

@@ -8,7 +8,7 @@ import { Npmci } from '../npmci.classes.npmci';
 export class NpmciNpmManager {
   public npmciRef: Npmci;
 
-  constructor(npmciRefArg) {
+  constructor(npmciRefArg: Npmci) {
     this.npmciRef = npmciRefArg;
   }
 
@@ -16,7 +16,7 @@ export class NpmciNpmManager {
    * handle cli input
    * @param argvArg
    */
-  public async handleCli(argvArg) {
+  public async handleCli(argvArg: any) {
     if (argvArg._.length >= 2) {
       const action: string = argvArg._[1];
       switch (action) {
@@ -54,17 +54,21 @@ export class NpmciNpmManager {
   public async prepare() {
     const config = this.npmciRef.npmciConfig.getConfig();
     let npmrcFileString: string = '';
-    await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', (npmEnvArg) => {
+    await plugins.smartparam.forEachMinimatch(
-      const npmRegistryUrl = npmEnvArg.split('|')[0];
+      process.env,
-      let npmToken = npmEnvArg.split('|')[1];
+      'NPMCI_TOKEN_NPM*',
-      if (npmEnvArg.split('|')[2] && npmEnvArg.split('|')[2] === 'plain') {
+      (npmEnvArg: string) => {
-        logger.log('ok', 'npm token not base64 encoded.');
+        const npmRegistryUrl = npmEnvArg.split('|')[0];
-      } else {
+        let npmToken = npmEnvArg.split('|')[1];
-        logger.log('ok', 'npm token base64 encoded.');
+        if (npmEnvArg.split('|')[2] && npmEnvArg.split('|')[2] === 'plain') {
-        npmToken = plugins.smartstring.base64.decode(npmToken);
+          logger.log('ok', 'npm token not base64 encoded.');
+        } else {
+          logger.log('ok', 'npm token base64 encoded.');
+          npmToken = plugins.smartstring.base64.decode(npmToken);
+        }
+        npmrcFileString += `//${npmRegistryUrl}/:_authToken="${npmToken}"\n`;
       }
-      npmrcFileString += `//${npmRegistryUrl}/:_authToken="${npmToken}"\n`;
+    );
-    });
     logger.log('info', `setting default npm registry to ${config.npmRegistryUrl}`);
     npmrcFileString += `registry=https://${config.npmRegistryUrl}\n`;
 
@@ -95,9 +99,13 @@ export class NpmciNpmManager {
       let publishVerdaccioAsWell = false;
       const config = this.npmciRef.npmciConfig.getConfig();
       const availableRegistries: string[] = [];
-      await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', (npmEnvArg) => {
+      await plugins.smartparam.forEachMinimatch(
-        availableRegistries.push(npmEnvArg.split('|')[0]);
+        process.env,
-      });
+        'NPMCI_TOKEN_NPM*',
+        (npmEnvArg: string) => {
+          availableRegistries.push(npmEnvArg.split('|')[0]);
+        }
+      );
 
       // -> configure package access level
       if (config.npmAccessLevel) {

ts/mod_ssh/index.ts

@@ -2,7 +2,7 @@ import { logger } from '../npmci.logging';
 import * as plugins from './mod.plugins';
 let sshInstance: plugins.smartssh.SshInstance;
 
-export let handleCli = async (argvArg) => {
+export let handleCli = async (argvArg: any) => {
   if (argvArg._.length >= 2) {
     const action: string = argvArg._[1];
     switch (action) {

ts/mod_trigger/index.ts

@@ -2,7 +2,8 @@ import * as plugins from './mod.plugins';
 import { bash } from '../npmci.bash';
 import { logger } from '../npmci.logging';
 
-const triggerValueRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/;
+const triggerValueRegex =
+  /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.\-\/]*)/;
 
 export let trigger = async () => {
   logger.log('info', 'now running triggers');

ts/npmci.plugins.ts

@@ -9,7 +9,7 @@ import * as typedrequest from '@apiglobal/typedrequest';
 export { typedrequest };
 
 // @servezone
-import * as servezoneInterfaces from '@servezone/servezone-interfaces';
+import * as servezoneInterfaces from '@servezone/interfaces';
 
 export { servezoneInterfaces };
 
@@ -21,6 +21,7 @@ import * as smartanalytics from '@pushrocks/smartanalytics';
 import * as smartdelay from '@pushrocks/smartdelay';
 import * as smartfile from '@pushrocks/smartfile';
 import * as smartcli from '@pushrocks/smartcli';
+import * as smartgit from '@pushrocks/smartgit';
 import * as smartlog from '@pushrocks/smartlog';
 import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
 import * as smartparam from '@pushrocks/smartparam';
@@ -50,6 +51,14 @@ export {
   smartstring,
 };
 
+// @tsclass scope
+import * as tsclass from '@tsclass/tsclass';
+
+export {
+  tsclass
+}
+
+// third party
 import * as through2 from 'through2';
 
 export { through2 };