@firestartr/cli 1.46.0 → 1.47.0-snapshot-1

package/build/index.js

@@ -282357,6 +282357,38 @@ async function resolveClaimFileRef(claimFile) {
         throw new Error(`Error: file ${claimFile}: ${err}`);
     }
 }
+function getClaimsEntryAbsolutePath(claimsDir, entryPath, forbidRelativePath = false) {
+    let realEntryPath = '';
+    if (external_path_default().isAbsolute(entryPath)) {
+        realEntryPath = entryPath;
+    }
+    else {
+        if (forbidRelativePath) {
+            throw new Error('getClaimsEntryAbsolutePath: relatives paths are forbidden');
+        }
+        else {
+            realEntryPath = external_path_default().join(claimsDir, entryPath);
+        }
+    }
+    if (isPathInside(claimsDir, realEntryPath)) {
+        return realEntryPath;
+    }
+    else {
+        throw new Error(`getClaimsEntryAbsolutePath: path ${entryPath} does not belong to ${claimsDir}`);
+    }
+}
+function isPathInside(pathA, pathB) {
+    const absolutePathA = external_path_default().resolve(pathA);
+    const absolutePathB = external_path_default().resolve(pathB);
+    const normalizedPathA = external_path_default().normalize(absolutePathA);
+    const normalizedPathB = external_path_default().normalize(absolutePathB);
+    // Ensure pathA ends with a separator to avoid partial matches
+    // e.g., /foo/lol must not match /foo/lollipop
+    const pathAWithSeparator = normalizedPathA.endsWith((external_path_default()).sep)
+        ? normalizedPathA
+        : `${normalizedPathA}${(external_path_default()).sep}`;
+    return normalizedPathB.startsWith(pathAWithSeparator);
+}
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/imports/firestartr.dev.ts
 // generated by cdk8s
@@ -285537,8 +285569,8 @@ class SecretsChart extends BaseSecretsChart {
             .concat(pushSecrets)
             .filter((el) => el !== undefined);
         return concatenated.map((chart) => {
-            console.log('CHART-TO-JSON');
-            console.dir(chart, { depth: null });
+            //console.log('CHART-TO-JSON');
+            //console.dir(chart, { depth: null });
             const cr = chart.toJson();
             return {
                 claim: { kind, name: `${name}-${cr.kind}-${cr.metadata.name}` },
@@ -286207,7 +286239,7 @@ async function addLastStateAndLastClaimAnnotations(filePath, lastStatePRLink, la
  * This function returns nothing.
  *
  */
-async function runRenderer(globalsPath, initializersPath, claimsPath, crsPath, claimsDefaults, outputCatalogDir, outputCrDir, renamesEnabled, provider, excludedPaths = [], validateReferentialIntegrity, claimRefs = '', claimFilesList = '') {
+async function runRenderer(globalsPath, initializersPath, claimsPath, crsPath, claimsDefaults, outputCatalogDir, outputCrDir, renamesEnabled, provider, excludedPaths = [], validateReferentialIntegrity, claimRefs = '', claimFilesList = '', forbidRelativeFileListPaths = false) {
     configureProvider(provider);
     setPath('initializers', initializersPath);
     setPath('crs', crsPath);
@@ -286231,7 +286263,11 @@ async function runRenderer(globalsPath, initializersPath, claimsPath, crsPath, c
         claimRefsList = await claimsRefListAsGenerator(claimRefs.replace(/\s/g, '').split(','));
     }
     else if (claimFilesList) {
-        claimRefsList = await resolveClaimEntries(claimFilesList.replace(/\s/g, '').split(','));
+        const claimFilesListPaths = claimFilesList
+            .replace(/\s/g, '')
+            .split(',')
+            .map((entryPath) => getClaimsEntryAbsolutePath(claimsPath, entryPath, forbidRelativeFileListPaths));
+        claimRefsList = await resolveClaimEntries(claimFilesListPaths);
     }
     else {
         // in case nothing is passed
@@ -294387,6 +294423,7 @@ const cdk8s_rendererSubcommands = {
         { name: 'disableRenames', type: Boolean, defaultValue: false },
         { name: 'claimRefsList', type: String, defaultValue: '' },
         { name: 'claimFilesList', type: String, defaultValue: '' },
+        { name: 'forbidRelativeFileListPaths', type: String, defaultValue: false },
         /**
          * Path where the claims defaults are located
          */

package/build/packages/cdk8s_renderer/index.d.ts

@@ -37,4 +37,4 @@ declare const _default: {
     addLastStateAndLastClaimAnnotations: typeof addLastStateAndLastClaimAnnotations;
 };
 export default _default;
-export declare function runRenderer(globalsPath: string, initializersPath: string, claimsPath: string, crsPath: string, claimsDefaults: string, outputCatalogDir: string, outputCrDir: string, renamesEnabled: boolean, provider: AllowedProviders, excludedPaths: string[], validateReferentialIntegrity: string, claimRefs?: string, claimFilesList?: string): Promise<void>;
+export declare function runRenderer(globalsPath: string, initializersPath: string, claimsPath: string, crsPath: string, claimsDefaults: string, outputCatalogDir: string, outputCrDir: string, renamesEnabled: boolean, provider: AllowedProviders, excludedPaths: string[], validateReferentialIntegrity: string, claimRefs?: string, claimFilesList?: string, forbidRelativeFileListPaths?: boolean): Promise<void>;

package/build/packages/cdk8s_renderer/src/utils/claimUtils.d.ts

@@ -3,3 +3,4 @@ export declare function claimsRefListAsGenerator(refs: string[]): AsyncGenerator
 export declare function resolveClaimFilesList(claimRefsList: string): string[];
 export declare function resolveClaimEntries(claimRefsList: string[]): AsyncGenerator<string, void, unknown>;
 export declare function resolveClaimFileRef(claimFile: string): Promise<string>;
+export declare function getClaimsEntryAbsolutePath(claimsDir: string, entryPath: string, forbidRelativePath?: boolean): string;

package/package.json

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