@kapeta/local-cluster-service 0.7.1 → 0.7.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.7.3](https://github.com/kapetacom/local-cluster-service/compare/v0.7.2...v0.7.3) (2023-07-17)
+
+
+### Bug Fixes
+
+* Handle windows paths ([45eedcb](https://github.com/kapetacom/local-cluster-service/commit/45eedcb4b95a1d403d88dd63d74fa98b2c949559))
+
+## [0.7.2](https://github.com/kapetacom/local-cluster-service/compare/v0.7.1...v0.7.2) (2023-07-16)
+
+
+### Bug Fixes
+
+* Removed missed module.exports from TS module ([d6d85af](https://github.com/kapetacom/local-cluster-service/commit/d6d85af4823960baa52d3a87243d2639dd4cdab4))
+
 ## [0.7.1](https://github.com/kapetacom/local-cluster-service/compare/v0.7.0...v0.7.1) (2023-07-16)
 
 

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

@@ -85,5 +85,13 @@ export declare class ContainerInfo {
     getStatus(): Promise<any>;
     getPorts(): Promise<PortMap | false>;
 }
+/**
+ * Ensure that the volume is in the correct format for the docker daemon on the host
+ *
+ * Windows: c:\path\to\volume -> /c/path/to/volume
+ * Linux: /path/to/volume -> /path/to/volume
+ * Mac: /path/to/volume -> /path/to/volume
+ */
+export declare function toLocalBindVolume(volume: string): string;
 export declare const containerManager: ContainerManager;
 export {};

package/dist/cjs/src/containerManager.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.containerManager = exports.ContainerInfo = void 0;
+exports.containerManager = exports.toLocalBindVolume = exports.ContainerInfo = void 0;
 const path_1 = __importDefault(require("path"));
 const storageService_1 = require("./storageService");
 const os_1 = __importDefault(require("os"));
@@ -143,7 +143,7 @@ class ContainerManager {
         lodash_1.default.forEach(mounts, (Source, Target) => {
             Mounts.push({
                 Target,
-                Source,
+                Source: toLocalBindVolume(Source),
                 Type: 'bind',
                 ReadOnly: false,
                 Consistency: 'consistent',
@@ -362,4 +362,23 @@ class ContainerInfo {
     }
 }
 exports.ContainerInfo = ContainerInfo;
+/**
+ * Ensure that the volume is in the correct format for the docker daemon on the host
+ *
+ * Windows: c:\path\to\volume -> /c/path/to/volume
+ * Linux: /path/to/volume -> /path/to/volume
+ * Mac: /path/to/volume -> /path/to/volume
+ */
+function toLocalBindVolume(volume) {
+    if (process.platform === 'win32') {
+        //On Windows we need to convert c:\ to /c/
+        return volume
+            .replace(/^([a-z]):\\/i, (match, drive) => {
+            return '/' + drive.toLowerCase() + '/';
+        })
+            .replace(/\\(\S)/g, '/$1');
+    }
+    return volume;
+}
+exports.toLocalBindVolume = toLocalBindVolume;
 exports.containerManager = new ContainerManager();

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

@@ -204,8 +204,8 @@ class BlockInstanceRunner {
             ],
             HostConfig: {
                 Binds: [
-                    `${local_cluster_config_1.default.getKapetaBasedir()}:${homeDir}/.kapeta`,
-                    `${baseDir}:${workingDir}`, //We mount
+                    `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${homeDir}/.kapeta`,
+                    `${(0, containerManager_1.toLocalBindVolume)(baseDir)}:${workingDir}`, //We mount
                 ],
                 PortBindings,
             },
@@ -315,7 +315,9 @@ class BlockInstanceRunner {
                     ...Object.entries(env).map(([key, value]) => `${key}=${value}`),
                 ],
                 HostConfig: {
-                    Binds: [`${local_cluster_config_1.default.getKapetaBasedir()}:${local_cluster_config_1.default.getKapetaBasedir()}`],
+                    Binds: [
+                        `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${local_cluster_config_1.default.getKapetaBasedir()}`,
+                    ],
                 },
             });
             try {
@@ -426,8 +428,8 @@ class BlockInstanceRunner {
                 HealthCheck,
                 HostConfig: {
                     Binds: [
-                        `${kapetaYmlPath}:/kapeta.yml:ro`,
-                        `${local_cluster_config_1.default.getKapetaBasedir()}:${local_cluster_config_1.default.getKapetaBasedir()}`,
+                        `${(0, containerManager_1.toLocalBindVolume)(kapetaYmlPath)}:/kapeta.yml:ro`,
+                        `${(0, containerManager_1.toLocalBindVolume)(local_cluster_config_1.default.getKapetaBasedir())}:${local_cluster_config_1.default.getKapetaBasedir()}`,
                     ],
                     PortBindings,
                     Mounts,

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

@@ -40,4 +40,3 @@ class LogData {
     }
 }
 exports.LogData = LogData;
-module.exports = LogData;

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

@@ -85,5 +85,13 @@ export declare class ContainerInfo {
     getStatus(): Promise<any>;
     getPorts(): Promise<PortMap | false>;
 }
+/**
+ * Ensure that the volume is in the correct format for the docker daemon on the host
+ *
+ * Windows: c:\path\to\volume -> /c/path/to/volume
+ * Linux: /path/to/volume -> /path/to/volume
+ * Mac: /path/to/volume -> /path/to/volume
+ */
+export declare function toLocalBindVolume(volume: string): string;
 export declare const containerManager: ContainerManager;
 export {};

package/dist/esm/src/containerManager.js

@@ -137,7 +137,7 @@ class ContainerManager {
         _.forEach(mounts, (Source, Target) => {
             Mounts.push({
                 Target,
-                Source,
+                Source: toLocalBindVolume(Source),
                 Type: 'bind',
                 ReadOnly: false,
                 Consistency: 'consistent',
@@ -355,4 +355,22 @@ export class ContainerInfo {
         return ports;
     }
 }
+/**
+ * Ensure that the volume is in the correct format for the docker daemon on the host
+ *
+ * Windows: c:\path\to\volume -> /c/path/to/volume
+ * Linux: /path/to/volume -> /path/to/volume
+ * Mac: /path/to/volume -> /path/to/volume
+ */
+export function toLocalBindVolume(volume) {
+    if (process.platform === 'win32') {
+        //On Windows we need to convert c:\ to /c/
+        return volume
+            .replace(/^([a-z]):\\/i, (match, drive) => {
+            return '/' + drive.toLowerCase() + '/';
+        })
+            .replace(/\\(\S)/g, '/$1');
+    }
+    return volume;
+}
 export const containerManager = new ContainerManager();

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

@@ -3,7 +3,7 @@ import ClusterConfig from '@kapeta/local-cluster-config';
 import { readYML } from './utils';
 import { parseKapetaUri } from '@kapeta/nodejs-utils';
 import { serviceManager } from '../serviceManager';
-import { containerManager } from '../containerManager';
+import { containerManager, toLocalBindVolume } from '../containerManager';
 import { LogData } from './LogData';
 import EventEmitter from 'events';
 import md5 from 'md5';
@@ -198,8 +198,8 @@ export class BlockInstanceRunner {
             ],
             HostConfig: {
                 Binds: [
-                    `${ClusterConfig.getKapetaBasedir()}:${homeDir}/.kapeta`,
-                    `${baseDir}:${workingDir}`, //We mount
+                    `${toLocalBindVolume(ClusterConfig.getKapetaBasedir())}:${homeDir}/.kapeta`,
+                    `${toLocalBindVolume(baseDir)}:${workingDir}`, //We mount
                 ],
                 PortBindings,
             },
@@ -309,7 +309,9 @@ export class BlockInstanceRunner {
                     ...Object.entries(env).map(([key, value]) => `${key}=${value}`),
                 ],
                 HostConfig: {
-                    Binds: [`${ClusterConfig.getKapetaBasedir()}:${ClusterConfig.getKapetaBasedir()}`],
+                    Binds: [
+                        `${toLocalBindVolume(ClusterConfig.getKapetaBasedir())}:${ClusterConfig.getKapetaBasedir()}`,
+                    ],
                 },
             });
             try {
@@ -420,8 +422,8 @@ export class BlockInstanceRunner {
                 HealthCheck,
                 HostConfig: {
                     Binds: [
-                        `${kapetaYmlPath}:/kapeta.yml:ro`,
-                        `${ClusterConfig.getKapetaBasedir()}:${ClusterConfig.getKapetaBasedir()}`,
+                        `${toLocalBindVolume(kapetaYmlPath)}:/kapeta.yml:ro`,
+                        `${toLocalBindVolume(ClusterConfig.getKapetaBasedir())}:${ClusterConfig.getKapetaBasedir()}`,
                     ],
                     PortBindings,
                     Mounts,

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

@@ -36,4 +36,3 @@ export class LogData {
             .join('\n');
     }
 }
-module.exports = LogData;

package/package.json

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

package/src/containerManager.ts

@@ -189,7 +189,7 @@ class ContainerManager {
         _.forEach(mounts, (Source, Target) => {
             Mounts.push({
                 Target,
-                Source,
+                Source: toLocalBindVolume(Source),
                 Type: 'bind',
                 ReadOnly: false,
                 Consistency: 'consistent',
@@ -252,7 +252,6 @@ class ContainerManager {
             Hostname: name + '.kapeta',
             Labels,
             Cmd: opts.cmd,
-
             ExposedPorts,
             Env,
             HealthCheck,
@@ -463,4 +462,23 @@ export class ContainerInfo {
     }
 }
 
+/**
+ * Ensure that the volume is in the correct format for the docker daemon on the host
+ *
+ * Windows: c:\path\to\volume -> /c/path/to/volume
+ * Linux: /path/to/volume -> /path/to/volume
+ * Mac: /path/to/volume -> /path/to/volume
+ */
+export function toLocalBindVolume(volume: string): string {
+    if (process.platform === 'win32') {
+        //On Windows we need to convert c:\ to /c/
+        return volume
+            .replace(/^([a-z]):\\/i, (match, drive) => {
+                return '/' + drive.toLowerCase() + '/';
+            })
+            .replace(/\\(\S)/g, '/$1');
+    }
+    return volume;
+}
+
 export const containerManager = new ContainerManager();

package/src/operatorManager.ts

@@ -1,5 +1,4 @@
 import ClusterConfiguration, { DefinitionInfo } from '@kapeta/local-cluster-config';
-import _ from 'lodash';
 import Path from 'path';
 import md5 from 'md5';
 import { parseKapetaUri } from '@kapeta/nodejs-utils';
@@ -8,7 +7,7 @@ import { storageService } from './storageService';
 import { ContainerInfo, containerManager } from './containerManager';
 import FSExtra from 'fs-extra';
 import { AnyMap, EnvironmentType, OperatorInfo } from './types';
-import { BlockInstance, BlockResource, Resource } from '@kapeta/schemas';
+import { BlockInstance, Resource } from '@kapeta/schemas';
 
 const KIND_OPERATOR = 'core/resource-type-operator';
 

package/src/repositoryManager.ts

@@ -51,7 +51,7 @@ class RepositoryManager {
             if (!filename) {
                 return;
             }
-            
+
             const [handle, name, version] = filename.toString().split(/\//g);
             if (!name || !version) {
                 return;

package/src/utils/BlockInstanceRunner.ts

@@ -1,19 +1,14 @@
-import { spawn } from 'node:child_process';
 import FS from 'node:fs';
-import Path from 'node:path';
-import { Docker } from 'node-docker-api';
 import ClusterConfig, { DefinitionInfo } from '@kapeta/local-cluster-config';
 import { readYML } from './utils';
 import { KapetaURI, parseKapetaUri } from '@kapeta/nodejs-utils';
 import { serviceManager } from '../serviceManager';
-import { containerManager, DockerMounts } from '../containerManager';
+import { containerManager, DockerMounts, toLocalBindVolume } from '../containerManager';
 import { LogData } from './LogData';
 import EventEmitter from 'events';
 import md5 from 'md5';
-import { execSync } from 'child_process';
 import { clusterService } from '../clusterService';
 import { AnyMap, BlockProcessParams, ProcessDetails, ProcessInfo, StringMap } from '../types';
-import { BlockDefinition, BlockInstance, BlockInstanceConfiguration, BlockResource } from '@kapeta/schemas';
 import { Container } from 'node-docker-api/lib/container';
 
 const KIND_BLOCK_TYPE_OPERATOR = 'core/block-type-operator';
@@ -252,8 +247,8 @@ export class BlockInstanceRunner {
             ],
             HostConfig: {
                 Binds: [
-                    `${ClusterConfig.getKapetaBasedir()}:${homeDir}/.kapeta`,
-                    `${baseDir}:${workingDir}`, //We mount
+                    `${toLocalBindVolume(ClusterConfig.getKapetaBasedir())}:${homeDir}/.kapeta`,
+                    `${toLocalBindVolume(baseDir)}:${workingDir}`, //We mount
                 ],
                 PortBindings,
             },
@@ -379,7 +374,9 @@ export class BlockInstanceRunner {
                     ...Object.entries(env).map(([key, value]) => `${key}=${value}`),
                 ],
                 HostConfig: {
-                    Binds: [`${ClusterConfig.getKapetaBasedir()}:${ClusterConfig.getKapetaBasedir()}`],
+                    Binds: [
+                        `${toLocalBindVolume(ClusterConfig.getKapetaBasedir())}:${ClusterConfig.getKapetaBasedir()}`,
+                    ],
                 },
             });
 
@@ -513,8 +510,8 @@ export class BlockInstanceRunner {
                 HealthCheck,
                 HostConfig: {
                     Binds: [
-                        `${kapetaYmlPath}:/kapeta.yml:ro`,
-                        `${ClusterConfig.getKapetaBasedir()}:${ClusterConfig.getKapetaBasedir()}`,
+                        `${toLocalBindVolume(kapetaYmlPath)}:/kapeta.yml:ro`,
+                        `${toLocalBindVolume(ClusterConfig.getKapetaBasedir())}:${ClusterConfig.getKapetaBasedir()}`,
                     ],
                     PortBindings,
                     Mounts,

package/src/utils/LogData.ts

@@ -1,7 +1,6 @@
 import { LogEntry, LogLevel, LogSource } from '../types';
 
 const MAX_LINES = 1000;
-
 export class LogData {
     public static readonly MAX_LINES = MAX_LINES;
     private readonly entries: LogEntry[] = [];
@@ -43,5 +42,3 @@ export class LogData {
             .join('\n');
     }
 }
-
-module.exports = LogData;