@kapeta/local-cluster-service 0.40.6 → 0.41.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [0.41.0](https://github.com/kapetacom/local-cluster-service/compare/v0.40.6...v0.41.0) (2024-04-12)
+
+
+### Bug Fixes
+
+* review comments ([c0b75a0](https://github.com/kapetacom/local-cluster-service/commit/c0b75a08994c0505f4598327547ccd2199efa94a))
+
+
+### Features
+
+* append connected block operator specific env to blocks ([a003c4f](https://github.com/kapetacom/local-cluster-service/commit/a003c4fdb98706aebbc6bc8ae28cf9cc6e7ba9cf))
+
 ## [0.40.6](https://github.com/kapetacom/local-cluster-service/compare/v0.40.5...v0.40.6) (2024-04-11)
 
 

package/dist/cjs/src/utils/BlockInstanceRunner.d.ts

@@ -26,4 +26,5 @@ export declare class BlockInstanceRunner {
     private ensureContainer;
     private _handleContainer;
     private getFileHash;
+    private appendConnectedBlockOperatorEnv;
 }

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

@@ -114,7 +114,8 @@ class BlockInstanceRunner {
         const realBaseDir = await fs_extra_1.default.realpath(baseDir);
         const internalConfigProvider = await (0, InternalConfigProvider_1.createInternalConfigProvider)(this._systemId, blockInstance.id, assetVersion);
         // Resolve the environment variables
-        const variables = await (0, config_mapper_1.resolveKapetaVariables)(realBaseDir, internalConfigProvider);
+        const blockVariables = await (0, config_mapper_1.resolveKapetaVariables)(realBaseDir, internalConfigProvider);
+        const variables = await this.appendConnectedBlockOperatorEnv(internalConfigProvider, blockInstance, blockVariables);
         // Write out the config templates if they exist
         await (0, config_mapper_1.writeConfigTemplates)(variables, realBaseDir);
         const env = await (0, config_mapper_1.getEnvironmentVariables)(variables);
@@ -409,6 +410,7 @@ class BlockInstanceRunner {
                     PortBindings,
                     Mounts,
                 },
+                Cmd: local.cmd,
                 Labels: {
                     ...labels,
                     instance: operatorId,
@@ -480,5 +482,39 @@ class BlockInstanceRunner {
         //Creating the hash in the required format
         return data.digest('hex');
     }
+    async appendConnectedBlockOperatorEnv(internalConfigProvider, blockInstance, variables) {
+        const plan = await internalConfigProvider.getPlan();
+        const connectedBlockIds = [
+            ...new Set(plan.spec.connections
+                .filter((connection) => connection.provider.blockId == blockInstance.id || connection.consumer.blockId == blockInstance.id)
+                .flatMap((connection) => [connection.provider.blockId, connection.consumer.blockId])
+                .filter((blockId) => blockId !== blockInstance.id)),
+        ];
+        for (const connectedBlockId of connectedBlockIds) {
+            const connectedBlockInstance = plan.spec.blocks.find((blockInstance) => blockInstance.id == connectedBlockId);
+            if (!connectedBlockInstance) {
+                continue;
+            }
+            const connectedBlockDefinition = await internalConfigProvider.getBlock(connectedBlockInstance?.block.ref);
+            const connectedBlockDefinitionInfo = await getProvider((0, nodejs_utils_1.parseKapetaUri)(connectedBlockDefinition.kind));
+            const local = connectedBlockDefinitionInfo?.definition.spec.local;
+            if (!local || !local.addEnv) {
+                continue;
+            }
+            const connectedBlockInstanceOperator = await internalConfigProvider.getInstanceOperator(connectedBlockId);
+            for (const addEnv of local.addEnv) {
+                var result;
+                try {
+                    result = eval(addEnv)(connectedBlockInstanceOperator);
+                }
+                catch (error) {
+                    result = addEnv;
+                }
+                const parts = result.split('=');
+                variables[parts[0]] = { type: config_mapper_1.VariableType.ENV, value: parts[1], json: false };
+            }
+        }
+        return variables;
+    }
 }
 exports.BlockInstanceRunner = BlockInstanceRunner;

package/dist/esm/src/utils/BlockInstanceRunner.d.ts

@@ -26,4 +26,5 @@ export declare class BlockInstanceRunner {
     private ensureContainer;
     private _handleContainer;
     private getFileHash;
+    private appendConnectedBlockOperatorEnv;
 }

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

@@ -114,7 +114,8 @@ class BlockInstanceRunner {
         const realBaseDir = await fs_extra_1.default.realpath(baseDir);
         const internalConfigProvider = await (0, InternalConfigProvider_1.createInternalConfigProvider)(this._systemId, blockInstance.id, assetVersion);
         // Resolve the environment variables
-        const variables = await (0, config_mapper_1.resolveKapetaVariables)(realBaseDir, internalConfigProvider);
+        const blockVariables = await (0, config_mapper_1.resolveKapetaVariables)(realBaseDir, internalConfigProvider);
+        const variables = await this.appendConnectedBlockOperatorEnv(internalConfigProvider, blockInstance, blockVariables);
         // Write out the config templates if they exist
         await (0, config_mapper_1.writeConfigTemplates)(variables, realBaseDir);
         const env = await (0, config_mapper_1.getEnvironmentVariables)(variables);
@@ -409,6 +410,7 @@ class BlockInstanceRunner {
                     PortBindings,
                     Mounts,
                 },
+                Cmd: local.cmd,
                 Labels: {
                     ...labels,
                     instance: operatorId,
@@ -480,5 +482,39 @@ class BlockInstanceRunner {
         //Creating the hash in the required format
         return data.digest('hex');
     }
+    async appendConnectedBlockOperatorEnv(internalConfigProvider, blockInstance, variables) {
+        const plan = await internalConfigProvider.getPlan();
+        const connectedBlockIds = [
+            ...new Set(plan.spec.connections
+                .filter((connection) => connection.provider.blockId == blockInstance.id || connection.consumer.blockId == blockInstance.id)
+                .flatMap((connection) => [connection.provider.blockId, connection.consumer.blockId])
+                .filter((blockId) => blockId !== blockInstance.id)),
+        ];
+        for (const connectedBlockId of connectedBlockIds) {
+            const connectedBlockInstance = plan.spec.blocks.find((blockInstance) => blockInstance.id == connectedBlockId);
+            if (!connectedBlockInstance) {
+                continue;
+            }
+            const connectedBlockDefinition = await internalConfigProvider.getBlock(connectedBlockInstance?.block.ref);
+            const connectedBlockDefinitionInfo = await getProvider((0, nodejs_utils_1.parseKapetaUri)(connectedBlockDefinition.kind));
+            const local = connectedBlockDefinitionInfo?.definition.spec.local;
+            if (!local || !local.addEnv) {
+                continue;
+            }
+            const connectedBlockInstanceOperator = await internalConfigProvider.getInstanceOperator(connectedBlockId);
+            for (const addEnv of local.addEnv) {
+                var result;
+                try {
+                    result = eval(addEnv)(connectedBlockInstanceOperator);
+                }
+                catch (error) {
+                    result = addEnv;
+                }
+                const parts = result.split('=');
+                variables[parts[0]] = { type: config_mapper_1.VariableType.ENV, value: parts[1], json: false };
+            }
+        }
+        return variables;
+    }
 }
 exports.BlockInstanceRunner = BlockInstanceRunner;

package/package.json

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

package/src/utils/BlockInstanceRunner.ts

@@ -33,13 +33,15 @@ import OS from 'node:os';
 import Path from 'node:path';
 import { taskManager } from '../taskManager';
 import { LocalDevContainer, LocalInstance } from '@kapeta/schemas';
-import { createInternalConfigProvider } from './InternalConfigProvider';
+import { createInternalConfigProvider, InternalConfigProvider } from './InternalConfigProvider';
 import {
     getConfigFilePath,
     getEnvironmentVariables,
     KAPETA_CONFIG_ENV_VAR,
     KAPETA_ENV_CONFIG_FILE,
     resolveKapetaVariables,
+    Variables,
+    VariableType,
     writeConfigTemplates,
     writeEnvConfigFile,
 } from '@kapeta/config-mapper';
@@ -157,7 +159,12 @@ export class BlockInstanceRunner {
         );
 
         // Resolve the environment variables
-        const variables = await resolveKapetaVariables(realBaseDir, internalConfigProvider);
+        const blockVariables = await resolveKapetaVariables(realBaseDir, internalConfigProvider);
+        const variables = await this.appendConnectedBlockOperatorEnv(
+            internalConfigProvider,
+            blockInstance,
+            blockVariables
+        );
 
         // Write out the config templates if they exist
         await writeConfigTemplates(variables, realBaseDir);
@@ -556,6 +563,7 @@ export class BlockInstanceRunner {
                         PortBindings,
                         Mounts,
                     },
+                    Cmd: local.cmd,
                     Labels: {
                         ...labels,
                         instance: operatorId,
@@ -645,4 +653,52 @@ export class BlockInstanceRunner {
         //Creating the hash in the required format
         return data.digest('hex');
     }
+
+    private async appendConnectedBlockOperatorEnv(
+        internalConfigProvider: InternalConfigProvider,
+        blockInstance: BlockProcessParams,
+        variables: Variables
+    ): Promise<Variables> {
+        const plan = await internalConfigProvider.getPlan();
+
+        const connectedBlockIds = [
+            ...new Set(
+                plan.spec.connections
+                    .filter((connection) => connection.provider.blockId == blockInstance.id || connection.consumer.blockId == blockInstance.id)
+                    .flatMap((connection) => [connection.provider.blockId, connection.consumer.blockId])
+                    .filter((blockId) => blockId !== blockInstance.id)
+            ),
+        ];
+
+        for (const connectedBlockId of connectedBlockIds) {
+            const connectedBlockInstance = plan.spec.blocks.find((blockInstance) => blockInstance.id == connectedBlockId);
+            if (!connectedBlockInstance) {
+                continue;
+            }
+
+            const connectedBlockDefinition = await internalConfigProvider.getBlock(connectedBlockInstance?.block.ref);
+            const connectedBlockDefinitionInfo = await getProvider(parseKapetaUri(connectedBlockDefinition.kind));
+
+            const local = connectedBlockDefinitionInfo?.definition.spec.local;
+
+            if (!local || !local.addEnv) {
+                continue;
+            }
+
+            const connectedBlockInstanceOperator = await internalConfigProvider.getInstanceOperator(connectedBlockId);
+
+            for (const addEnv of local.addEnv) {
+                var result: string;
+                try {
+                    result = eval(addEnv)(connectedBlockInstanceOperator) as string;
+                } catch (error) {
+                    result = addEnv;
+                }
+                const parts = result.split('=');
+                variables[parts[0]] = { type: VariableType.ENV, value: parts[1], json: false };
+            }
+        }
+
+        return variables;
+    }
 }