@kapeta/local-cluster-service 0.19.2 → 0.19.4

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.19.4](https://github.com/kapetacom/local-cluster-service/compare/v0.19.3...v0.19.4) (2023-09-05)
+
+
+### Bug Fixes
+
+* Do not rename local sample if we already have ([095737e](https://github.com/kapetacom/local-cluster-service/commit/095737e7cfd94ec1e5dc8efcb178fbf88f67d783))
+
+## [0.19.3](https://github.com/kapetacom/local-cluster-service/compare/v0.19.2...v0.19.3) (2023-09-05)
+
+
+### Bug Fixes
+
+* if codegen is already started for block - run after ([#69](https://github.com/kapetacom/local-cluster-service/issues/69)) ([a1b13ee](https://github.com/kapetacom/local-cluster-service/commit/a1b13eeab8413be8c165419ee36c26e3509338b4))
+
 ## [0.19.2](https://github.com/kapetacom/local-cluster-service/compare/v0.19.1...v0.19.2) (2023-09-05)
 
 

package/dist/cjs/src/assetManager.js

@@ -16,6 +16,7 @@ const definitionsManager_1 = require("./definitionsManager");
 const utils_1 = require("./utils/utils");
 const taskManager_1 = require("./taskManager");
 const cacheManager_1 = require("./cacheManager");
+const node_uuid_1 = __importDefault(require("node-uuid"));
 const CACHE_TTL = 60 * 60 * 1000; // 1 hour
 const toKey = (ref) => `assetManager:asset:${ref}`;
 function enrichAsset(asset) {
@@ -180,10 +181,14 @@ class AssetManager {
         ref = (0, utils_1.normalizeKapetaUri)(ref);
         if (await codeGeneratorManager_1.codeGeneratorManager.canGenerateCode(block)) {
             const assetTitle = block.metadata.title ? block.metadata.title : (0, nodejs_utils_1.parseKapetaUri)(block.metadata.name).name;
-            taskManager_1.taskManager.add(`codegen:${ref}`, async () => {
+            const taskId = `codegen:${node_uuid_1.default.v4()}`;
+            const group = `codegen:${ref}`;
+            // We group the codegen tasks since we want to run them all but only 1 at a time per block
+            taskManager_1.taskManager.add(taskId, async () => {
                 await codeGeneratorManager_1.codeGeneratorManager.generate(ymlPath, block);
             }, {
                 name: `Generating code for ${assetTitle}`,
+                group, //Group prevents multiple tasks from running at the same time
             });
             return true;
         }

package/dist/cjs/src/definitionsManager.js

@@ -15,9 +15,12 @@ const nodejs_registry_utils_1 = require("@kapeta/nodejs-registry-utils");
 const progressListener_1 = require("./progressListener");
 const path_1 = __importDefault(require("path"));
 exports.SAMPLE_PLAN_NAME = 'kapeta/sample-nodejs-plan';
-function applyHandleChange(definition, targetHandle) {
+function getRenamed(definition, targetHandle) {
     const originalUri = (0, nodejs_utils_1.parseKapetaUri)(definition.definition.metadata.name);
-    definition.definition.metadata.name = `${targetHandle}/${originalUri.name}`;
+    return `${targetHandle}/${originalUri.name}`;
+}
+function applyHandleChange(definition, targetHandle) {
+    definition.definition.metadata.name = getRenamed(definition, targetHandle);
     return definition;
 }
 function normalizeFilters(kindFilter) {
@@ -50,6 +53,11 @@ class DefinitionsManager {
             // Not logged in yet, so we can't rewrite the sample plan
             return definitions;
         }
+        const newName = getRenamed(samplePlan, profile.handle);
+        if (definitions.some((d) => d.definition.metadata.name === newName && d.version === 'local')) {
+            // We already have a local version of the sample plan
+            return definitions;
+        }
         console.log('Rewriting sample plan to use handle %s', profile.handle);
         applyHandleChange(samplePlan, profile.handle);
         const planDef = samplePlan.definition;

package/dist/cjs/src/repositoryManager.js

@@ -26,9 +26,9 @@ const DEFAULT_PROVIDERS = [
     'kapeta/resource-type-web-fragment',
     'kapeta/resource-type-mongodb',
     'kapeta/resource-type-postgresql',
+    'kapeta/resource-type-smtp-client',
     'kapeta/language-target-react-ts',
     'kapeta/language-target-nodejs',
-    'kapeta/language-target-java-spring-boot',
 ];
 class RepositoryManager extends node_events_1.EventEmitter {
     _registryService;
@@ -84,7 +84,10 @@ class RepositoryManager extends node_events_1.EventEmitter {
                     throw e;
                 }
                 cacheManager_1.cacheManager.flush();
-                //console.log(`Asset installed: ${ref}`);
+                if (await definitionsManager_1.definitionsManager.exists(ref)) {
+                    return;
+                }
+                throw new Error(`Failed to install asset: ${ref}`);
             };
         };
         const tasks = [];

package/dist/esm/src/assetManager.js

@@ -16,6 +16,7 @@ const definitionsManager_1 = require("./definitionsManager");
 const utils_1 = require("./utils/utils");
 const taskManager_1 = require("./taskManager");
 const cacheManager_1 = require("./cacheManager");
+const node_uuid_1 = __importDefault(require("node-uuid"));
 const CACHE_TTL = 60 * 60 * 1000; // 1 hour
 const toKey = (ref) => `assetManager:asset:${ref}`;
 function enrichAsset(asset) {
@@ -180,10 +181,14 @@ class AssetManager {
         ref = (0, utils_1.normalizeKapetaUri)(ref);
         if (await codeGeneratorManager_1.codeGeneratorManager.canGenerateCode(block)) {
             const assetTitle = block.metadata.title ? block.metadata.title : (0, nodejs_utils_1.parseKapetaUri)(block.metadata.name).name;
-            taskManager_1.taskManager.add(`codegen:${ref}`, async () => {
+            const taskId = `codegen:${node_uuid_1.default.v4()}`;
+            const group = `codegen:${ref}`;
+            // We group the codegen tasks since we want to run them all but only 1 at a time per block
+            taskManager_1.taskManager.add(taskId, async () => {
                 await codeGeneratorManager_1.codeGeneratorManager.generate(ymlPath, block);
             }, {
                 name: `Generating code for ${assetTitle}`,
+                group, //Group prevents multiple tasks from running at the same time
             });
             return true;
         }

package/dist/esm/src/definitionsManager.js

@@ -15,9 +15,12 @@ const nodejs_registry_utils_1 = require("@kapeta/nodejs-registry-utils");
 const progressListener_1 = require("./progressListener");
 const path_1 = __importDefault(require("path"));
 exports.SAMPLE_PLAN_NAME = 'kapeta/sample-nodejs-plan';
-function applyHandleChange(definition, targetHandle) {
+function getRenamed(definition, targetHandle) {
     const originalUri = (0, nodejs_utils_1.parseKapetaUri)(definition.definition.metadata.name);
-    definition.definition.metadata.name = `${targetHandle}/${originalUri.name}`;
+    return `${targetHandle}/${originalUri.name}`;
+}
+function applyHandleChange(definition, targetHandle) {
+    definition.definition.metadata.name = getRenamed(definition, targetHandle);
     return definition;
 }
 function normalizeFilters(kindFilter) {
@@ -50,6 +53,11 @@ class DefinitionsManager {
             // Not logged in yet, so we can't rewrite the sample plan
             return definitions;
         }
+        const newName = getRenamed(samplePlan, profile.handle);
+        if (definitions.some((d) => d.definition.metadata.name === newName && d.version === 'local')) {
+            // We already have a local version of the sample plan
+            return definitions;
+        }
         console.log('Rewriting sample plan to use handle %s', profile.handle);
         applyHandleChange(samplePlan, profile.handle);
         const planDef = samplePlan.definition;

package/dist/esm/src/repositoryManager.js

@@ -26,9 +26,9 @@ const DEFAULT_PROVIDERS = [
     'kapeta/resource-type-web-fragment',
     'kapeta/resource-type-mongodb',
     'kapeta/resource-type-postgresql',
+    'kapeta/resource-type-smtp-client',
     'kapeta/language-target-react-ts',
     'kapeta/language-target-nodejs',
-    'kapeta/language-target-java-spring-boot',
 ];
 class RepositoryManager extends node_events_1.EventEmitter {
     _registryService;
@@ -84,7 +84,10 @@ class RepositoryManager extends node_events_1.EventEmitter {
                     throw e;
                 }
                 cacheManager_1.cacheManager.flush();
-                //console.log(`Asset installed: ${ref}`);
+                if (await definitionsManager_1.definitionsManager.exists(ref)) {
+                    return;
+                }
+                throw new Error(`Failed to install asset: ${ref}`);
             };
         };
         const tasks = [];

package/package.json

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

package/src/assetManager.ts

@@ -13,6 +13,7 @@ import { normalizeKapetaUri } from './utils/utils';
 import { taskManager } from './taskManager';
 import { SourceOfChange } from './types';
 import { cacheManager } from './cacheManager';
+import uuid from 'node-uuid';
 
 const CACHE_TTL = 60 * 60 * 1000; // 1 hour
 
@@ -242,13 +243,17 @@ class AssetManager {
         ref = normalizeKapetaUri(ref);
         if (await codeGeneratorManager.canGenerateCode(block)) {
             const assetTitle = block.metadata.title ? block.metadata.title : parseKapetaUri(block.metadata.name).name;
+            const taskId = `codegen:${uuid.v4()}`;
+            const group = `codegen:${ref}`;
+            // We group the codegen tasks since we want to run them all but only 1 at a time per block
             taskManager.add(
-                `codegen:${ref}`,
+                taskId,
                 async () => {
                     await codeGeneratorManager.generate(ymlPath, block);
                 },
                 {
                     name: `Generating code for ${assetTitle}`,
+                    group, //Group prevents multiple tasks from running at the same time
                 }
             );
             return true;

package/src/definitionsManager.ts

@@ -12,9 +12,12 @@ import Path from 'path';
 
 export const SAMPLE_PLAN_NAME = 'kapeta/sample-nodejs-plan';
 
-function applyHandleChange(definition: DefinitionInfo, targetHandle: string) {
+function getRenamed(definition: DefinitionInfo, targetHandle: string) {
     const originalUri = parseKapetaUri(definition.definition.metadata.name);
-    definition.definition.metadata.name = `${targetHandle}/${originalUri.name}`;
+    return `${targetHandle}/${originalUri.name}`;
+}
+function applyHandleChange(definition: DefinitionInfo, targetHandle: string) {
+    definition.definition.metadata.name = getRenamed(definition, targetHandle);
     return definition;
 }
 
@@ -55,10 +58,15 @@ class DefinitionsManager {
             return definitions;
         }
 
-        console.log('Rewriting sample plan to use handle %s', profile.handle);
+        const newName = getRenamed(samplePlan, profile.handle);
 
-        applyHandleChange(samplePlan, profile.handle);
+        if (definitions.some((d) => d.definition.metadata.name === newName && d.version === 'local')) {
+            // We already have a local version of the sample plan
+            return definitions;
+        }
 
+        console.log('Rewriting sample plan to use handle %s', profile.handle);
+        applyHandleChange(samplePlan, profile.handle);
         const planDef = samplePlan.definition as Plan;
 
         const blockRefs = new Set<string>();

package/src/repositoryManager.ts

@@ -24,9 +24,9 @@ const DEFAULT_PROVIDERS = [
     'kapeta/resource-type-web-fragment',
     'kapeta/resource-type-mongodb',
     'kapeta/resource-type-postgresql',
+    'kapeta/resource-type-smtp-client',
     'kapeta/language-target-react-ts',
     'kapeta/language-target-nodejs',
-    'kapeta/language-target-java-spring-boot',
 ];
 
 class RepositoryManager extends EventEmitter {
@@ -90,7 +90,10 @@ class RepositoryManager extends EventEmitter {
                     throw e;
                 }
                 cacheManager.flush();
-                //console.log(`Asset installed: ${ref}`);
+                if (await definitionsManager.exists(ref)) {
+                    return;
+                }
+                throw new Error(`Failed to install asset: ${ref}`);
             };
         };