@kapeta/local-cluster-service 0.21.5 → 0.22.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.22.1](https://github.com/kapetacom/local-cluster-service/compare/v0.22.0...v0.22.1) (2023-10-21)
+
+
+### Bug Fixes
+
+* Bump kapeta api to fix auth ([#86](https://github.com/kapetacom/local-cluster-service/issues/86)) ([1178afc](https://github.com/kapetacom/local-cluster-service/commit/1178afce54a25cddb52944201097bc28c59b038a))
+
+# [0.22.0](https://github.com/kapetacom/local-cluster-service/compare/v0.21.5...v0.22.0) (2023-10-17)
+
+
+### Features
+
+* Allow local containers to add Binds ([#85](https://github.com/kapetacom/local-cluster-service/issues/85)) ([c7b46e9](https://github.com/kapetacom/local-cluster-service/commit/c7b46e94412da1eec82503f7d30957fc665e71e6))
+
 ## [0.21.5](https://github.com/kapetacom/local-cluster-service/compare/v0.21.4...v0.21.5) (2023-09-26)
 
 

package/dist/cjs/index.js

@@ -141,7 +141,7 @@ exports.default = {
             throw new Error(`Cluster service already running on: ${clusterHost}:${clusterPort}.`);
         }
         await clusterService_1.clusterService.init();
-        await authManager_1.authManager.listenForChanges();
+        authManager_1.authManager.listenForChanges();
         currentServer = createServer();
         const port = clusterService_1.clusterService.getClusterServicePort();
         const host = clusterService_1.clusterService.getClusterServiceHost();

package/dist/cjs/src/operatorManager.d.ts

@@ -16,10 +16,6 @@ declare class OperatorManager {
     _getMountPoint(operatorType: string, mountName: string): string;
     /**
      * Get operator definition for resource type
-     *
-     * @param {string} resourceType
-     * @param {string} version
-     * @return {Operator}
      */
     getOperator(resourceType: string, version: string): Promise<Operator>;
     /**

package/dist/cjs/src/operatorManager.js

@@ -45,10 +45,6 @@ class OperatorManager {
     }
     /**
      * Get operator definition for resource type
-     *
-     * @param {string} resourceType
-     * @param {string} version
-     * @return {Operator}
      */
     async getOperator(resourceType, version) {
         const operators = await definitionsManager_1.definitionsManager.getDefinitions(exports.KIND_OPERATOR);
@@ -84,7 +80,12 @@ class OperatorManager {
         if (!blockDefinition) {
             throw new Error(`Unknown block: ${currentInstance.block.ref} in plan ${systemId}`);
         }
-        const blockResource = blockDefinition.definition.spec?.consumers?.find((resource) => resource.metadata.name === name);
+        const blockResource = blockDefinition.definition.spec?.consumers?.find((resource) => {
+            if (resource.metadata.name !== name) {
+                return false;
+            }
+            return (0, nodejs_utils_1.parseKapetaUri)(resource.kind).fullName === resourceType;
+        });
         if (!blockResource) {
             throw new Error(`Unknown resource: ${name} in block ${currentInstance.block.ref} in plan ${systemId}`);
         }

package/dist/cjs/src/utils/BlockInstanceRunner.js

@@ -14,6 +14,7 @@ const LogData_1 = require("./LogData");
 const clusterService_1 = require("../clusterService");
 const types_1 = require("../types");
 const definitionsManager_1 = require("../definitionsManager");
+const node_os_1 = __importDefault(require("node:os"));
 const KIND_BLOCK_TYPE_OPERATOR = 'core/block-type-operator';
 const KAPETA_SYSTEM_ID = 'KAPETA_SYSTEM_ID';
 const KAPETA_BLOCK_REF = 'KAPETA_BLOCK_REF';
@@ -46,7 +47,8 @@ function getProviderPorts(assetVersion, providerVersion) {
         }
         return [serviceManager_1.DEFAULT_PORT_TYPE];
     }
-    return out;
+    // Duplicated port types are not allowed
+    return Array.from(new Set(out));
 }
 class BlockInstanceRunner {
     _systemId;
@@ -148,6 +150,8 @@ class BlockInstanceRunner {
         const homeDir = localContainer.userHome ? localContainer.userHome : '/root';
         const workingDir = localContainer.workingDir ? localContainer.workingDir : '/workspace';
         const customHostConfigs = localContainer.HostConfig ?? {};
+        const Binds = customHostConfigs.Binds ?? [];
+        delete customHostConfigs.Binds;
         const customLabels = localContainer.Labels ?? {};
         const customEnvs = localContainer.Env ?? [];
         delete localContainer.HostConfig;
@@ -160,7 +164,7 @@ class BlockInstanceRunner {
         }
         const realLocalPath = node_fs_1.default.realpathSync(baseDir);
         const Mounts = containerManager_1.containerManager.toDockerMounts({
-            [workingDir]: (0, containerManager_1.toLocalBindVolume)(realLocalPath)
+            [workingDir]: (0, containerManager_1.toLocalBindVolume)(realLocalPath),
         });
         const systemUri = (0, nodejs_utils_1.parseKapetaUri)(this._systemId);
         return this.ensureContainer({
@@ -189,10 +193,20 @@ class BlockInstanceRunner {
             HostConfig: {
                 ...customHostConfigs,
                 Binds: [
-                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`
+                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`,
+                    ...Binds.map((bind) => {
+                        let [host, container] = bind.split(':');
+                        if (host.startsWith('~')) {
+                            host = node_os_1.default.homedir() + host.substring(1);
+                        }
+                        if (container.startsWith('~')) {
+                            container = homeDir + container.substring(1);
+                        }
+                        return `${(0, containerManager_1.toLocalBindVolume)(host)}:${container}`;
+                    }),
                 ],
                 PortBindings,
-                Mounts
+                Mounts,
             },
         });
     }

package/dist/cjs/start.js

@@ -8,6 +8,6 @@ index_1.default
     .start()
     .then(({ host, port }) => console.log('Listening on port %s:%s', host, port))
     .catch((e) => {
-    console.error('Failed to start local cluster due to an error:\n\t - %s', e.toString());
+    console.error('Failed to start local cluster due to an error:\n\t - %s', e);
     process.exit(1);
 });

package/dist/esm/index.js

@@ -141,7 +141,7 @@ exports.default = {
             throw new Error(`Cluster service already running on: ${clusterHost}:${clusterPort}.`);
         }
         await clusterService_1.clusterService.init();
-        await authManager_1.authManager.listenForChanges();
+        authManager_1.authManager.listenForChanges();
         currentServer = createServer();
         const port = clusterService_1.clusterService.getClusterServicePort();
         const host = clusterService_1.clusterService.getClusterServiceHost();

package/dist/esm/src/operatorManager.d.ts

@@ -16,10 +16,6 @@ declare class OperatorManager {
     _getMountPoint(operatorType: string, mountName: string): string;
     /**
      * Get operator definition for resource type
-     *
-     * @param {string} resourceType
-     * @param {string} version
-     * @return {Operator}
      */
     getOperator(resourceType: string, version: string): Promise<Operator>;
     /**

package/dist/esm/src/operatorManager.js

@@ -45,10 +45,6 @@ class OperatorManager {
     }
     /**
      * Get operator definition for resource type
-     *
-     * @param {string} resourceType
-     * @param {string} version
-     * @return {Operator}
      */
     async getOperator(resourceType, version) {
         const operators = await definitionsManager_1.definitionsManager.getDefinitions(exports.KIND_OPERATOR);
@@ -84,7 +80,12 @@ class OperatorManager {
         if (!blockDefinition) {
             throw new Error(`Unknown block: ${currentInstance.block.ref} in plan ${systemId}`);
         }
-        const blockResource = blockDefinition.definition.spec?.consumers?.find((resource) => resource.metadata.name === name);
+        const blockResource = blockDefinition.definition.spec?.consumers?.find((resource) => {
+            if (resource.metadata.name !== name) {
+                return false;
+            }
+            return (0, nodejs_utils_1.parseKapetaUri)(resource.kind).fullName === resourceType;
+        });
         if (!blockResource) {
             throw new Error(`Unknown resource: ${name} in block ${currentInstance.block.ref} in plan ${systemId}`);
         }

package/dist/esm/src/utils/BlockInstanceRunner.js

@@ -14,6 +14,7 @@ const LogData_1 = require("./LogData");
 const clusterService_1 = require("../clusterService");
 const types_1 = require("../types");
 const definitionsManager_1 = require("../definitionsManager");
+const node_os_1 = __importDefault(require("node:os"));
 const KIND_BLOCK_TYPE_OPERATOR = 'core/block-type-operator';
 const KAPETA_SYSTEM_ID = 'KAPETA_SYSTEM_ID';
 const KAPETA_BLOCK_REF = 'KAPETA_BLOCK_REF';
@@ -46,7 +47,8 @@ function getProviderPorts(assetVersion, providerVersion) {
         }
         return [serviceManager_1.DEFAULT_PORT_TYPE];
     }
-    return out;
+    // Duplicated port types are not allowed
+    return Array.from(new Set(out));
 }
 class BlockInstanceRunner {
     _systemId;
@@ -148,6 +150,8 @@ class BlockInstanceRunner {
         const homeDir = localContainer.userHome ? localContainer.userHome : '/root';
         const workingDir = localContainer.workingDir ? localContainer.workingDir : '/workspace';
         const customHostConfigs = localContainer.HostConfig ?? {};
+        const Binds = customHostConfigs.Binds ?? [];
+        delete customHostConfigs.Binds;
         const customLabels = localContainer.Labels ?? {};
         const customEnvs = localContainer.Env ?? [];
         delete localContainer.HostConfig;
@@ -160,7 +164,7 @@ class BlockInstanceRunner {
         }
         const realLocalPath = node_fs_1.default.realpathSync(baseDir);
         const Mounts = containerManager_1.containerManager.toDockerMounts({
-            [workingDir]: (0, containerManager_1.toLocalBindVolume)(realLocalPath)
+            [workingDir]: (0, containerManager_1.toLocalBindVolume)(realLocalPath),
         });
         const systemUri = (0, nodejs_utils_1.parseKapetaUri)(this._systemId);
         return this.ensureContainer({
@@ -189,10 +193,20 @@ class BlockInstanceRunner {
             HostConfig: {
                 ...customHostConfigs,
                 Binds: [
-                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`
+                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`,
+                    ...Binds.map((bind) => {
+                        let [host, container] = bind.split(':');
+                        if (host.startsWith('~')) {
+                            host = node_os_1.default.homedir() + host.substring(1);
+                        }
+                        if (container.startsWith('~')) {
+                            container = homeDir + container.substring(1);
+                        }
+                        return `${(0, containerManager_1.toLocalBindVolume)(host)}:${container}`;
+                    }),
                 ],
                 PortBindings,
-                Mounts
+                Mounts,
             },
         });
     }

package/dist/esm/start.js

@@ -8,6 +8,6 @@ index_1.default
     .start()
     .then(({ host, port }) => console.log('Listening on port %s:%s', host, port))
     .catch((e) => {
-    console.error('Failed to start local cluster due to an error:\n\t - %s', e.toString());
+    console.error('Failed to start local cluster due to an error:\n\t - %s', e);
     process.exit(1);
 });

package/index.ts

@@ -162,7 +162,8 @@ export default {
         }
 
         await clusterService.init();
-        await authManager.listenForChanges();
+
+        authManager.listenForChanges();
 
         currentServer = createServer();
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.21.5",
+    "version": "0.22.1",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {

package/src/operatorManager.ts

@@ -59,10 +59,6 @@ class OperatorManager {
 
     /**
      * Get operator definition for resource type
-     *
-     * @param {string} resourceType
-     * @param {string} version
-     * @return {Operator}
      */
     async getOperator(resourceType: string, version: string) {
         const operators = await definitionsManager.getDefinitions(KIND_OPERATOR);
@@ -122,9 +118,13 @@ class OperatorManager {
             throw new Error(`Unknown block: ${currentInstance.block.ref} in plan ${systemId}`);
         }
 
-        const blockResource = blockDefinition.definition.spec?.consumers?.find(
-            (resource: Resource) => resource.metadata.name === name
-        );
+        const blockResource = blockDefinition.definition.spec?.consumers?.find((resource: Resource) => {
+            if (resource.metadata.name !== name) {
+                return false;
+            }
+            return parseKapetaUri(resource.kind).fullName === resourceType;
+        });
+
         if (!blockResource) {
             throw new Error(`Unknown resource: ${name} in block ${currentInstance.block.ref} in plan ${systemId}`);
         }

package/src/utils/BlockInstanceRunner.ts

@@ -15,6 +15,7 @@ import { clusterService } from '../clusterService';
 import { AnyMap, BlockProcessParams, InstanceType, ProcessInfo, StringMap } from '../types';
 import { definitionsManager } from '../definitionsManager';
 import Docker from 'dockerode';
+import OS from 'node:os';
 
 const KIND_BLOCK_TYPE_OPERATOR = 'core/block-type-operator';
 const KAPETA_SYSTEM_ID = 'KAPETA_SYSTEM_ID';
@@ -53,8 +54,8 @@ function getProviderPorts(assetVersion: DefinitionInfo, providerVersion: Definit
         }
         return [DEFAULT_PORT_TYPE];
     }
-
-    return out;
+    // Duplicated port types are not allowed
+    return Array.from(new Set<string>(out));
 }
 
 export class BlockInstanceRunner {
@@ -194,6 +195,8 @@ export class BlockInstanceRunner {
         const workingDir = localContainer.workingDir ? localContainer.workingDir : '/workspace';
 
         const customHostConfigs = localContainer.HostConfig ?? {};
+        const Binds = customHostConfigs.Binds ?? [];
+        delete customHostConfigs.Binds;
         const customLabels = localContainer.Labels ?? {};
         const customEnvs = localContainer.Env ?? [];
         delete localContainer.HostConfig;
@@ -214,7 +217,7 @@ export class BlockInstanceRunner {
         const realLocalPath = FS.realpathSync(baseDir);
 
         const Mounts = containerManager.toDockerMounts({
-            [workingDir]: toLocalBindVolume(realLocalPath)
+            [workingDir]: toLocalBindVolume(realLocalPath),
         });
 
         const systemUri = parseKapetaUri(this._systemId);
@@ -245,10 +248,22 @@ export class BlockInstanceRunner {
             HostConfig: {
                 ...customHostConfigs,
                 Binds: [
-                    `${toLocalBindVolume(ClusterConfig.getKapetaBasedir())}:${homeDir}/.kapeta`
+                    `${toLocalBindVolume(ClusterConfig.getKapetaBasedir())}:${homeDir}/.kapeta`,
+                    ...Binds.map((bind: string) => {
+                        let [host, container] = bind.split(':');
+                        if (host.startsWith('~')) {
+                            host = OS.homedir() + host.substring(1);
+                        }
+
+                        if (container.startsWith('~')) {
+                            container = homeDir + container.substring(1);
+                        }
+
+                        return `${toLocalBindVolume(host)}:${container}`;
+                    }),
                 ],
                 PortBindings,
-                Mounts
+                Mounts,
             },
         });
     }

package/start.ts

@@ -4,6 +4,6 @@ localClusterService
     .start()
     .then(({ host, port }) => console.log('Listening on port %s:%s', host, port))
     .catch((e) => {
-        console.error('Failed to start local cluster due to an error:\n\t - %s', e.toString());
+        console.error('Failed to start local cluster due to an error:\n\t - %s', e);
         process.exit(1);
     });