@firestartr/cli 1.59.0-snapshot-13 → 1.59.0-snapshot-15

package/build/index.js

@@ -366104,7 +366104,7 @@ function importedsRefsWalker(renderClaim) {
     // the property can be another object, an array, or a primitive value
     // has a function to resolve
     // has to be an array of functions with
-    // the following signature: (solver: Function) => Promise<void>
+    // the following signature: (solver: (type: string, value: string) => Promise<string>) => Promise<void>
     const symbolsToResolve = [];
     walk(renderClaim.claim, symbolsToResolve, renderClaim);
     return symbolsToResolve;
@@ -366132,14 +366132,17 @@ function walkObject(obj, symbolsToResolve, renderClaim) {
                 continue;
             }
             const type = match.groups?.type;
-            const catchedKey = key;
+            const capturedKey = key;
             if (type) {
                 cdk8s_renderer_src_logger.info(`Found an imported-ref in the claim with key ${key} and value ${value}. This will be resolved later.`);
                 symbolsToResolve.push(async (solver) => {
-                    const resolvedValue = await solver(type, match.groups?.value);
+                    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 || '');
+                    obj[capturedKey] = resolvedValue;
+                    if (!renderClaim.claimPath) {
+                        throw new Error(`claimPath is required to write the claim after resolving imported refs in ${capturedKey}`);
+                    }
+                    await catalog_common.io.writeClaim(renderClaim.claim, renderClaim.claimPath);
                 });
             }
         }
@@ -366159,12 +366162,15 @@ function walkArray(arr, symbolsToResolve, renderClaim) {
             cdk8s_renderer_src_logger.info(`Found an imported-ref in the claim with value ${value}. This will be resolved later.`);
             const type = match.groups?.type;
             if (type) {
-                const catchedIndex = i;
+                const capturedIndex = i;
                 symbolsToResolve.push(async (solver) => {
-                    const resolvedValue = await solver(type, match.groups?.value);
+                    const resolvedValue = await solver(type, match.groups?.value ?? '');
                     cdk8s_renderer_src_logger.info(`Resolved imported-ref with value ${value} to ${resolvedValue} in path ${renderClaim.claimPath}`);
-                    arr[catchedIndex] = resolvedValue;
-                    await catalog_common.io.writeClaim(renderClaim.claim, renderClaim.claimPath || '');
+                    arr[capturedIndex] = resolvedValue;
+                    if (!renderClaim.claimPath) {
+                        throw new Error(`claimPath is required to write the claim after resolving imported refs in ${capturedIndex}`);
+                    }
+                    await catalog_common.io.writeClaim(renderClaim.claim, renderClaim.claimPath);
                 });
             }
         }
@@ -366178,6 +366184,7 @@ function walkArray(arr, symbolsToResolve, renderClaim) {
 
 
 
+
 /*
  * Function called when rendering from the importer class.
  *
@@ -366196,10 +366203,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,
@@ -370398,7 +370411,7 @@ function provisionCodeowners(scope, repo, branchDefault, fsGithubRepository) {
     const config = {
         dependsOn: [repo, branchDefault],
         branch: fsGithubRepository.spec.repo.defaultBranch,
-        commitMessage: 'feat: provision CODEOWNERS file',
+        commitMessage: 'ci: provision CODEOWNERS file',
         content: fsGithubRepository.spec.repo.codeowners,
         file: '.github/CODEOWNERS',
         overwriteOnCreate: true,
@@ -370704,7 +370717,7 @@ function provisionFeatureFiles(scope, feature) {
                 : {};
             const repoConfig = {
                 branch: file.targetBranch || defaultBranchName,
-                commitMessage: `feat: ${feature.spec.type} ${feature.spec.version}`,
+                commitMessage: `ci: ${feature.spec.type} ${feature.spec.version}`,
                 content: cdktf_lib.Fn.base64decode(file.content),
                 file: file.path,
                 repository: feature.resolveRef(feature.spec.repositoryTarget.ref),
@@ -376739,7 +376752,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"1.59.0-snapshot-13"}');
+const package_namespaceObject = JSON.parse('{"i8":"1.59.0-snapshot-15"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"1.58.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

package/build/packages/cdk8s_renderer/src/renderer/imported-refs.d.ts

@@ -1,4 +1,4 @@
 import { RenderClaimData } from './types';
-type SymbolResolver = (Function: any) => Promise<any>;
+type SymbolResolver = (solver: (type: string, value: string) => Promise<string>) => Promise<void>;
 export declare function importedsRefsWalker(renderClaim: RenderClaimData): SymbolResolver[];
 export {};

package/package.json

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