1.0.86

.gitlab-ci.yml

@@ -1,132 +0,0 @@
-# gitzone ci_default_private
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-    - .npmci_cache/
-  key: '$CI_BUILD_STAGE'
-
-stages:
-  - security
-  - test
-  - release
-  - metadata
-
-before_script:
-  - pnpm install -g pnpm
-  - pnpm install -g @shipzone/npmci
-  - npmci npm prepare
-
-# ====================
-# security stage
-# ====================
-# ====================
-# security stage
-# ====================
-auditProductionDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-     - npmci command npm config set registry https://registry.npmjs.org
-     - npmci command pnpm audit --audit-level=high --prod
-  tags:
-    - lossless
-    - docker
-
-auditDevDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command pnpm audit --audit-level=high --dev
-  tags:
-    - lossless
-    - docker
-  allow_failure: true
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-testBuild:
-  stage: test
-  script:
-    - npmci node install stable
-    - npmci npm install
-    - npmci command npm run build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-release:
-  stage: release
-  script:
-    - npmci node install stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  only:
-    - tags
-  script:
-    - npmci command npm install -g typescript
-    - npmci npm prepare
-    - npmci npm install
-  tags:
-    - lossless
-    - docker
-    - priv
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  stage: metadata
-  script:
-    - npmci node install lts
-    - npmci command npm install -g @git.zone/tsdoc
-    - npmci npm install
-    - npmci command tsdoc
-  tags:
-    - lossless
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

license

@@ -1,4 +1,6 @@
-Copyright (c) 2019 Lossless GmbH (hello@lossless.com)
+The MIT License (MIT)
+
+Copyright (c) 2019 Task Venture Capital GmbH (hello@task.vc)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serve.zone/spark",
-  "version": "1.0.84",
+  "version": "1.0.86",
   "private": false,
   "description": "A tool to maintain and configure servers on the base OS level for the Servezone infrastructure.",
   "main": "dist_ts/index.js",
@@ -16,28 +16,29 @@
     "spark": "./cli.js"
   },
   "devDependencies": {
-    "@git.zone/tsbuild": "^2.1.29",
+    "@git.zone/tsbuild": "^2.1.80",
     "@git.zone/tsrun": "^1.2.39",
     "@git.zone/tstest": "^1.0.60",
     "@push.rocks/tapbundle": "^5.0.4",
-    "@types/node": "20.10.0"
+    "@types/node": "20.14.2"
   },
   "dependencies": {
-    "@apiclient.xyz/docker": "^1.0.103",
+    "@apiclient.xyz/docker": "^1.2.2",
-    "@push.rocks/npmextra": "^5.0.13",
+    "@push.rocks/npmextra": "^5.0.17",
     "@push.rocks/projectinfo": "^5.0.1",
     "@push.rocks/qenv": "^6.0.5",
-    "@push.rocks/smartcli": "^4.0.6",
+    "@push.rocks/smartcli": "^4.0.11",
     "@push.rocks/smartdaemon": "^2.0.3",
     "@push.rocks/smartdelay": "^3.0.5",
-    "@push.rocks/smartfile": "^11.0.14",
+    "@push.rocks/smartfile": "^11.0.20",
-    "@push.rocks/smartjson": "^5.0.5",
+    "@push.rocks/smartjson": "^5.0.20",
-    "@push.rocks/smartlog": "^3.0.3",
+    "@push.rocks/smartlog": "^3.0.7",
     "@push.rocks/smartlog-destination-local": "^9.0.0",
     "@push.rocks/smartpath": "^5.0.5",
     "@push.rocks/smartshell": "^3.0.5",
     "@push.rocks/smartupdate": "^2.0.4",
-    "@push.rocks/taskbuffer": "^3.0.10"
+    "@push.rocks/taskbuffer": "^3.0.10",
+    "@serve.zone/interfaces": "^1.0.74"
   },
   "files": [
     "ts/**/*",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@serve.zone/spark',
-  version: '1.0.84',
+  version: '1.0.86',
   description: 'A tool to maintain and configure servers on the base OS level for the Servezone infrastructure.'
 }

ts/spark.classes.localconfig.ts

@@ -7,6 +7,9 @@ export class SparkLocalConfig {
 
   constructor(sparkRefArg: Spark) {
     this.sparkRef = sparkRefArg;
-    this.kvStore = new plugins.npmextra.KeyValueStore('custom', 'spark');
+    this.kvStore = new plugins.npmextra.KeyValueStore({
+      typeArg: 'userHomeDir',
+      identityArg: 'spark',
+    });
   }
 }

ts/spark.classes.updatemanager.ts

@@ -9,7 +9,7 @@ export class SparkUpdateManager {
   public smartupdate: plugins.smartupdate.SmartUpdate;
   constructor(sparkrefArg: Spark) {
     this.sparkRef = sparkrefArg;
-    this.dockerHost = new plugins.docker.DockerHost();
+    this.dockerHost = new plugins.docker.DockerHost({});
     this.smartupdate = new plugins.smartupdate.SmartUpdate();
   }
 
@@ -27,9 +27,6 @@ export class SparkUpdateManager {
         plugins.path.join(paths.homeDir, 'serve.zone/spark/spark.json')
       ))
     ) {
-      const sparkJson = plugins.smartfile.fs.toObjectSync(
-        plugins.path.join(paths.homeDir, 'serve.zone/spark/spark.json')
-      );
       const services: Array<{
         name: string;
         image: string;
@@ -38,16 +35,45 @@ export class SparkUpdateManager {
         environment: string;
         secretJson: any;
       }> = [];
-      for (const serviceKey of Object.keys(sparkJson.services)) {
+      // lets add coreflow
       services.push({
-          name: serviceKey,
+        name: `coreflow`,
-          image: sparkJson.services[serviceKey].image,
+        image: `code.foss.global/serve.zone/coreflow`,
-          url: sparkJson.services[serviceKey].url,
+        url: `coreflow`,
-          environment: sparkJson.services[serviceKey].environment,
+        environment: `production`,
-          port: sparkJson.services[serviceKey].port,
+        port: `3000`,
-          secretJson: sparkJson.services[serviceKey].secretJson,
+        secretJson: {
+          SERVEZONE_PORT: `3000`,
+          SERVEZONE_ENVIRONMENT: `production`,
+        },
       });
-      }
+
+      services.push({
+        name: `coretraffic`,
+        image: `code.foss.global/serve.zone/coretraffic`,
+        url: `coreflow`,
+        environment: `production`,
+        port: `3000`,
+        secretJson: {
+          SERVEZONE_PORT: `3000`,
+          SERVEZONE_ENVIRONMENT: `production`,
+        },
+      });
+
+      services.push({
+        name: `corelog`,
+        image: `code.foss.global/serve.zone/corelog`,
+        url: `coreflow`,
+        environment: `production`,
+        port: `3000`,
+        secretJson: {
+          SERVEZONE_PORT: `3000`,
+          SERVEZONE_ENVIRONMENT: `production`,
+        },
+      });
+
+      // lets add coretraffic
+
       for (const service of services) {
         const existingService = await plugins.docker.DockerService.getServiceByName(
           this.dockerHost,
@@ -61,6 +87,7 @@ export class SparkUpdateManager {
           const needsUpdate: boolean = await existingService.needsUpdate();
           if (!needsUpdate) {
             logger.log('info', `not needing update.`);
+            // we simply return here to end the functions
             return;
           }
           logger.log('ok', `${service.name} needs to be updated!`);
@@ -74,7 +101,9 @@ export class SparkUpdateManager {
         const newServiceImage = await plugins.docker.DockerImage.createFromRegistry(
           this.dockerHost,
           {
+            creationObject: {
               imageUrl: service.image,
+            },
           }
         );
         const newServiceSecret = await plugins.docker.DockerSecret.createSecret(this.dockerHost, {
@@ -92,8 +121,9 @@ export class SparkUpdateManager {
           secrets: [newServiceSecret],
           ports: [`${service.port}:${service.secretJson.SERVEZONE_PORT}`],
         });
-        logger.log('success', 'updated all services!');
+        logger.log('ok', `updated service >>${newService.Spec.Name}<<!`);
-      }
+      }
+      logger.log('success', `updated ${services.length} services!`);
     }
   }
 }

ts/spark.logging.ts

@@ -1,15 +1,7 @@
 import * as plugins from './spark.plugins.js';
 import * as paths from './spark.paths.js';
+import { commitinfo } from './00_commitinfo_data.js';
 
 const projectInfoNpm = new plugins.projectinfo.ProjectinfoNpm(paths.packageDir);
 
-export const logger = new plugins.smartlog.Smartlog({
+export const logger = plugins.smartlog.Smartlog.createForCommitinfo(commitinfo);
-  logContext: {
-    environment: 'production',
-    runtime: 'node',
-    zone: 'baremetal',
-    company: null,
-    companyunit: null,
-    containerName: 'spark',
-  }
-});

ts/spark.plugins.ts

@@ -3,6 +3,11 @@ import * as path from 'path';
 
 export { path };
 
+// @serve.zone scope
+import * as servezoneInterfaces from '@serve.zone/interfaces';
+
+export { servezoneInterfaces };
+
 // @apiclient.xyz scope
 import * as docker from '@apiclient.xyz/docker';