@firestartr/cli 1.59.0-snapshot-12 → 1.59.0-snapshot-14

package/build/index.js

@@ -366097,8 +366097,8 @@ async function renderTfWorkspace(claim, firestartrId, resolveRef, namespace) {
 
 
 // ref must match type-imported-ref where type can be group|user and:<value>
-// example: user-importer-ref:My Group
-const REGEX_IMPORTED_REF = /(?<type>user|group)-imported-ref:(?<value>.+)/;
+// example: user-imported-ref:My Group
+const REGEX_IMPORTED_REF = /^(?<type>user|group)-imported-ref:(?<value>.+)$/;
 function importedsRefsWalker(renderClaim) {
     // cr is an object, we want to walk through all its properties recursively
     // the property can be another object, an array, or a primitive value
@@ -366139,7 +366139,10 @@ function walkObject(obj, symbolsToResolve, renderClaim) {
                     const resolvedValue = await solver(type, match.groups?.value);
                     cdk8s_renderer_src_logger.info(`Resolved imported-ref with key ${key} and value ${value} to ${resolvedValue} in path ${renderClaim.claimPath}`);
                     obj[catchedKey] = resolvedValue;
-                    await catalog_common.io.writeClaim(renderClaim.claim, renderClaim.claimPath || '');
+                    if (!renderClaim.claimPath) {
+                        throw new Error('claimPath is required to write the claim after resolving imported refs in ${catchedKey}');
+                    }
+                    await catalog_common.io.writeClaim(renderClaim.claim, renderClaim.claimPath);
                 });
             }
         }
@@ -366178,6 +366181,7 @@ function walkArray(arr, symbolsToResolve, renderClaim) {
 
 
 
+
 /*
  * Function called when rendering from the importer class.
  *
@@ -366196,10 +366200,16 @@ async function renderFromImports(rClaims, crs = {}, catalogOutputDir = '/tmp/.ca
     const fSolver = (type, value) => {
         return solver(type, value, rClaims);
     };
-    // we need to expand the imported-refs
-    for (const renderClaim of Object.values(rClaims)) {
-        const symbolsToResolve = importedsRefsWalker(renderClaim);
-        await Promise.all(symbolsToResolve.map((s) => s(fSolver)));
+    try {
+        // we need to expand the imported-refs
+        for (const renderClaim of Object.values(rClaims)) {
+            const symbolsToResolve = importedsRefsWalker(renderClaim);
+            await Promise.all(symbolsToResolve.map((s) => s(fSolver)));
+        }
+    }
+    catch (e) {
+        cdk8s_renderer_src_logger.error(`Error while resolving imported-refs: ${e.message}`);
+        throw new Error(`Error while resolving imported-refs: ${e.message}`);
     }
     const catalogScope = new lib.App({
         outdir: catalogOutputDir,
@@ -376739,7 +376749,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"1.59.0-snapshot-12"}');
+const package_namespaceObject = JSON.parse('{"i8":"1.59.0-snapshot-14"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"1.58.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "1.59.0-snapshot-12",
+  "version": "1.59.0-snapshot-14",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",