@kapeta/local-cluster-service 0.19.3 → 0.19.4

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [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)
 
 

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/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.3",
+    "version": "0.19.4",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {

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}`);
             };
         };