@kapeta/local-cluster-service 0.5.12 → 0.6.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.6.1](https://github.com/kapetacom/local-cluster-service/compare/v0.6.0...v0.6.1) (2023-06-21)
+
+
+### Bug Fixes
+
+* Automaticly restart instances when changing configuration ([#39](https://github.com/kapetacom/local-cluster-service/issues/39)) ([9f6706f](https://github.com/kapetacom/local-cluster-service/commit/9f6706f7df9fb1c7375754bc81c56ccca93bbe12))
+
+# [0.6.0](https://github.com/kapetacom/local-cluster-service/compare/v0.5.12...v0.6.0) (2023-06-21)
+
+
+### Features
+
+* Implemented endpoints for getting public addresses ([#38](https://github.com/kapetacom/local-cluster-service/issues/38)) ([2eb96a9](https://github.com/kapetacom/local-cluster-service/commit/2eb96a97761f426e8a5aadab8703ce44f059f618))
+
 ## [0.5.12](https://github.com/kapetacom/local-cluster-service/compare/v0.5.11...v0.5.12) (2023-06-21)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kapeta/local-cluster-service",
-  "version": "0.5.12",
+  "version": "0.6.1",
   "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
   "main": "index.js",
   "repository": {

package/src/config/routes.js

@@ -2,6 +2,7 @@ const Router = require('express-promise-router').default;
 const configManager = require('../configManager');
 const serviceManager = require('../serviceManager');
 const operatorManager = require('../operatorManager');
+const instanceManager = require('../instanceManager');
 
 const router = new Router();
 const SYSTEM_ID = '$plan';
@@ -25,24 +26,33 @@ router.get('/instance', (req, res) => {
 /**
  * Updates the full configuration for a given service.
  */
-router.put('/instance', (req, res) => {
+router.put('/instance', async (req, res) => {
 
-    let config = JSON.parse(req.stringBody);
-    if (!config) {
-        config = {};
-    }
+    try {
+        let config = JSON.parse(req.stringBody);
+        if (!config) {
+            config = {};
+        }
 
-    if (req.kapeta.instanceId) {
-        configManager.setConfigForSection(
-            req.kapeta.systemId,
-            req.kapeta.instanceId,
-            config
-        );
-    } else {
-        configManager.setConfigForSystem(
-            req.kapeta.systemId,
-            config
-        );
+        if (req.kapeta.instanceId) {
+            configManager.setConfigForSection(
+                req.kapeta.systemId,
+                req.kapeta.instanceId,
+                config
+            );
+            //Restart the instance if it is running after config change
+            await instanceManager.restartIfRunning(req.kapeta.systemId, req.kapeta.instanceId);
+        } else {
+            configManager.setConfigForSystem(
+                req.kapeta.systemId,
+                config
+            );
+        }
+
+    } catch(err) {
+        console.error('Failed to update instance config', err);
+        res.status(400).send({error: err.message});
+        return;
     }
 
     res.status(202).send({ok:true});

package/src/instanceManager.js

@@ -460,6 +460,16 @@ class InstanceManager {
         return this._processes[planRef][instanceId];
     }
 
+    async restartIfRunning(planRef, instanceId) {
+        if (!this._processes[planRef] ||
+            !this._processes[planRef][instanceId]) {
+            return;
+        }
+
+        // createProcess will stop the process first if it's running
+        return this.createProcess(planRef, instanceId);
+    }
+
     async stopProcess(planRef, instanceId) {
         if (!this._processes[planRef]) {
             return;

package/src/instances/routes.js

@@ -1,6 +1,7 @@
 const Router = require('express-promise-router').default;
 
 const instanceManager = require('../instanceManager');
+const serviceManager = require('../serviceManager');
 
 
 const router = new Router();
@@ -27,9 +28,9 @@ router.post('/:systemId/start', async (req, res) => {
     const processes = await instanceManager.createProcessesForPlan(req.params.systemId);
 
     res.status(202).send({
-        ok:true,
+        ok: true,
         processes: processes.map(p => {
-            return {pid:p.pid, type:p.type};
+            return {pid: p.pid, type: p.type};
         })
     });
 });
@@ -41,7 +42,7 @@ router.post('/:systemId/stop', async (req, res) => {
     await instanceManager.stopAllForPlan(req.params.systemId);
 
     res.status(202).send({
-        ok:true
+        ok: true
     });
 });
 
@@ -52,7 +53,7 @@ router.post('/:systemId/:instanceId/start', async (req, res) => {
     const process = await instanceManager.createProcess(req.params.systemId, req.params.instanceId);
 
     res.status(202).send({
-        ok:true,
+        ok: true,
         pid: process.pid,
         type: process.type
     });
@@ -64,7 +65,7 @@ router.post('/:systemId/:instanceId/start', async (req, res) => {
 router.post('/:systemId/:instanceId/stop', async (req, res) => {
     await instanceManager.stopProcess(req.params.systemId, req.params.instanceId);
 
-    res.status(202).send({ok:true});
+    res.status(202).send({ok: true});
 });
 
 
@@ -74,7 +75,7 @@ router.post('/:systemId/:instanceId/stop', async (req, res) => {
 router.get('/:systemId/:instanceId/logs', (req, res) => {
     const processInfo = instanceManager.getProcessForInstance(req.params.systemId, req.params.instanceId);
     if (!processInfo) {
-        res.status(404).send({ok:false});
+        res.status(404).send({ok: false});
         return;
     }
 
@@ -83,6 +84,38 @@ router.get('/:systemId/:instanceId/logs', (req, res) => {
     });
 });
 
+
+/**
+ * Get public address for instance in a plan if available
+ */
+router.get('/:systemId/:instanceId/address/public', (req, res) => {
+    const instance = instanceManager.getInstance(req.params.systemId, req.params.instanceId);
+    if (!instance) {
+        res.status(404).send({ok: false});
+        return;
+    }
+
+    if (!instance.address) {
+        res.status(400).send({error: `Instance does not have an address. Make sure it's running.`});
+        return;
+    }
+
+    res.status(200).send(instance.address);
+});
+
+/**
+ * Get public address for particular resource on instance in a plan if available
+ */
+router.get('/:systemId/:instanceId/provider/:portType/:resourceName/address/public', (req, res) => {
+    res.send(serviceManager.getConsumerAddress(
+        req.params.systemId,
+        req.params.instanceId,
+        req.params.resourceName,
+        req.params.portType,
+        req.headers['x-kapeta-environment'],
+    ));
+});
+
 router.use('/', require('../middleware/stringBody'));
 router.use('/', require('../middleware/kapeta'));
 router.use('/', (req, res, next) => {
@@ -119,7 +152,7 @@ router.put('/', async (req, res) => {
         instance
     );
 
-    res.status(202).send({ok:true});
+    res.status(202).send({ok: true});
 });
 
 /**
@@ -128,7 +161,7 @@ router.put('/', async (req, res) => {
 router.delete('/', async (req, res) => {
     await instanceManager.setInstanceAsStopped(req.kapeta.systemId, req.kapeta.instanceId);
 
-    res.status(202).send({ok:true});
+    res.status(202).send({ok: true});
 });
 
 

package/src/utils/BlockInstanceRunner.js

@@ -11,11 +11,13 @@ const LogData = require("./LogData");
 const EventEmitter = require("events");
 const md5 = require('md5');
 const {execSync} = require("child_process");
+const clusterService = require("../clusterService");
 
 const KIND_BLOCK_TYPE_OPERATOR = 'core/block-type-operator';
 const KAPETA_SYSTEM_ID = "KAPETA_SYSTEM_ID";
 const KAPETA_BLOCK_REF = "KAPETA_BLOCK_REF";
 const KAPETA_INSTANCE_ID = "KAPETA_INSTANCE_ID";
+const KAPETA_LOCAL_CLUSTER_PORT = "KAPETA_LOCAL_CLUSTER_PORT";
 /**
  * Needed when running local docker containers as part of plan
  * @type {string[]}
@@ -250,7 +252,6 @@ class BlockInstanceRunner {
         container = await containerManager.startContainer({
             Image: dockerImage,
             name: containerName,
-            Hostname: containerName + '.kapeta',
             WorkingDir: workingDir,
             Labels: {
                 'instance': blockInstance.id
@@ -260,6 +261,7 @@ class BlockInstanceRunner {
             Cmd: startCmd ? startCmd.split(/\s+/g) : [],
             Env: [
                 ...DOCKER_ENV_VARS,
+                `KAPETA_LOCAL_CLUSTER_PORT=${clusterService.getClusterServicePort()}`,
                 ...Object.entries({
                     ...env,
                     ...addonEnv
@@ -398,12 +400,12 @@ class BlockInstanceRunner {
             container = await containerManager.startContainer({
                 Image: dockerImage,
                 name: containerName,
-                Hostname: containerName + '.kapeta',
                 Labels: {
                     'instance': blockInstance.id
                 },
                 Env: [
                     ...DOCKER_ENV_VARS,
+                    `KAPETA_LOCAL_CLUSTER_PORT=${clusterService.getClusterServicePort()}`,
                     ...Object.entries(env).map(([key, value]) => `${key}=${value}`)
                 ],
                 HostConfig: {
@@ -530,7 +532,6 @@ class BlockInstanceRunner {
             container = await containerManager.startContainer({
                 Image: dockerImage,
                 name: containerName,
-                Hostname: containerName + '.kapeta',
                 ExposedPorts,
                 HealthCheck,
                 HostConfig: {
@@ -546,6 +547,7 @@ class BlockInstanceRunner {
                 },
                 Env: [
                     `KAPETA_INSTANCE_NAME=${blockInstance.ref}`,
+                    `KAPETA_LOCAL_CLUSTER_PORT=${clusterService.getClusterServicePort()}`,
                     ...DOCKER_ENV_VARS,
                     ...Object.entries({
                         ...env,