@firestartr/cli 1.45.0-snapshot-9 → 1.45.0-snapshot-10

package/build/index.js

@@ -263047,26 +263047,26 @@ const fullMembersTeam = getFromEnvironmentWithDefault(envVars.fullOrgGroup, `${o
 
 
 const tarballs_messageLog = src_default()('firestartr:catalog_common:features:tarballs');
-function getFeatureZipDownloadPath(featureName, version, owner, repo) {
-    const featureDownloadPath = `/tmp/${basicFeaturePath(featureName, version, owner, repo)}-zipball.zip`;
+function getFeatureZipDownloadPath(featureName, version) {
+    const featureDownloadPath = `/tmp/${featureName}-${version}-zipball.zip`;
     tarballs_messageLog('Feature tarball download path %s', featureDownloadPath);
     return featureDownloadPath;
 }
-function removeFeatureTarball(featureName, version, owner, repo) {
-    const featurePath = getFeatureZipDownloadPath(featureName, version, owner, repo);
+function removeFeatureTarball(featureName, version) {
+    const featurePath = getFeatureZipDownloadPath(featureName, version);
     tarballs_messageLog('Removing feature tarball %s', featurePath);
     external_fs_.unlinkSync(featurePath);
     tarballs_messageLog(`Removed tarball for feature ${featureName} and version ${version}: ${featurePath}`);
 }
-function featureTarballExists(featureName, version, owner, repo) {
-    const featurePath = getFeatureZipDownloadPath(featureName, version, owner, repo);
+function featureTarballExists(featureName, version) {
+    const featurePath = getFeatureZipDownloadPath(featureName, version);
     const exists = external_fs_.existsSync(featurePath);
     tarballs_messageLog(`Tarball ${featurePath} exists? ${exists}`);
     return exists;
 }
-function getFeaturesExtractPath(featureName, version, owner, repo, options = {}) {
+function getFeaturesExtractPath(featureName, version, options = {}) {
     const { createIfNotExists } = options;
-    const extractPath = `/tmp/${basicFeaturePath(featureName, version, owner, repo)}-extract`;
+    const extractPath = `/tmp/${featureName}-${version}-extract`;
     tarballs_messageLog('Extract path %s', extractPath);
     if (createIfNotExists && !external_fs_.existsSync(extractPath)) {
         tarballs_messageLog('Extract path %s does not exist, creating', extractPath);
@@ -263074,13 +263074,6 @@ function getFeaturesExtractPath(featureName, version, owner, repo, options = {})
     }
     return extractPath;
 }
-function basicFeaturePath(featureName, version, owner, repo) {
-    const legs = [owner, repo, featureName, version].map((leg) => trasformLeg(leg));
-    return legs.join('-');
-}
-function trasformLeg(leg) {
-    return leg.replace(/\//g, '___');
-}
 
 ;// CONCATENATED MODULE: ../catalog_common/src/features/features_io.ts
 
@@ -263088,7 +263081,7 @@ function trasformLeg(leg) {
 
 const features_io_messageLog = src_default()('firestartr:catalog_common:features:features_io');
 function getFeatureRenderedPathForEntity(entity, featureName, basePath = '/tmp') {
-    const entityFolderName = `${entity.metadata.name}`.toLowerCase();
+    const entityFolderName = `${entity.kind}-${entity.metadata.name}`.toLowerCase();
     return external_path_default().join(basePath, entityFolderName, featureName);
 }
 function getFeatureRenderedConfigForComponent(entity, featureName, basePath = '/tmp/features') {
@@ -271648,7 +271641,6 @@ async function crawlWithExclusions(dir, filter, exec, excludedPaths = []) {
         }, exec);
     }
     catch (err) {
-        console.log(err);
         throw `Crawling with exclusions: ${dir}: ${err}`;
     }
 }
@@ -271674,7 +271666,6 @@ async function crawler_crawl(dir, filter, exec) {
         });
     }
     catch (err) {
-        console.log(err);
         throw `Crawling ${dir}: ${err}`;
     }
 }
@@ -271735,14 +271726,13 @@ async function crawlDirectory(dirEnt, exec) {
     for (const entry of entries) {
         const testDir = await isDir(entry);
         if (testDir) {
-            slurps.push(crawlDirectory(entry, exec));
+            slurps.push(() => crawlDirectory(entry, exec));
         }
         else {
-            slurps.push(slurpFile(entry, exec));
+            slurps.push(() => slurpFile(entry, exec));
         }
     }
-    return Promise.all(slurps).catch((err) => {
-        console.error(err);
+    return Promise.all(slurps.map((f) => f())).catch((err) => {
         throw `crawlDirectory: ${err} on ${dirEnt}`;
     });
 }
@@ -272927,7 +272917,6 @@ class FirestartrAllClaim {
                 },
                 ref: {
                     type: 'string',
-                    pattern: '^[a-zA-Z0-9-._@/]+$',
                     description: 'A github reference (commit, tag, branch)',
                 },
                 args: {
@@ -274231,8 +274220,13 @@ async function loadClaims(claimsPath = config_getPath('claims')) {
         if (!('kind' in claim && 'name' in claim)) {
             throw new Error(`Invalid claim file ${entry}`);
         }
-        validateClaim(claim, base[`${claim.kind}Schema`]);
-        await optionalValidation(claim);
+        try {
+            validateClaim(claim, base[`${claim.kind}Schema`]);
+            await optionalValidation(claim);
+        }
+        catch (err) {
+            throw new Error(`Validating ${claim.kind + '-' + claim.name}: ${JSON.stringify(err, null, 2)}`);
+        }
         if (result[`${claim.kind}-${claim.name}`]) {
             throw new Error(`Duplicate claim ${claim.kind}-${claim.name}`);
         }
@@ -275775,8 +275769,8 @@ function updateFileContent(featureRenderPath, filePath, content) {
 
 
 const renderer_messageLog = src_default()('firestartr:features_preparer:renderer');
-function renderFeature(featureName, version, owner, repo, featureOwner, renderPath = '/tmp', featureArgs = {}) {
-    const extractPath = external_path_default().join(catalog_common.features.tarballs.getFeaturesExtractPath(featureName, version, owner, repo), 'packages', featureName);
+function renderFeature(featureName, version, featureOwner, renderPath = '/tmp', featureArgs = {}) {
+    const extractPath = external_path_default().join(catalog_common.features.tarballs.getFeaturesExtractPath(featureName, version), 'packages', featureName);
     const renderedPath = catalog_common.features.features.getFeatureRenderedPathForEntity(featureOwner, featureName, renderPath);
     renderer_messageLog(`Rendering feature ${featureName} to ${renderedPath} with component ${JSON.stringify(featureOwner)}`);
     return features_renderer.render(extractPath, renderedPath, featureOwner, {}, featureArgs);
@@ -275816,8 +275810,6 @@ async function downloadZipBall(url, filePath) {
 
 
 
-
-const installer_log = src_default()('firestartr:features_preparer:installer');
 async function getFeatureConfigFromRef(featureName, featureRef, featureOwner, // -> cr
 featureArgs = {}, repo = 'features', owner = 'prefapp') {
     // reference is the featureRef directly
@@ -275840,20 +275832,19 @@ featureArgs = {}, repo = 'features', owner = 'prefapp') {
         ref: reference,
         url: `https://github.com/${owner}/${repo}/tree/${reference}/packages/${featureName}`,
     };
-    return renderFeature(featureName, reference, owner, repo, featureOwner, '/tmp', featureArgs);
+    return renderFeature(featureName, reference, featureOwner, '/tmp', featureArgs);
 }
 async function prepareFeature(featureName, version, repo = 'features', owner = 'prefapp') {
     await downloadFeatureZip(repo, featureName, version, owner);
 }
 async function downloadFeatureZip(repo, featureName, reference, owner = 'prefapp') {
     try {
-        const zipballExtractPath = catalog_common.features.tarballs.getFeaturesExtractPath(featureName, reference, owner, repo, { createIfNotExists: false });
+        const zipballExtractPath = catalog_common.features.tarballs.getFeaturesExtractPath(featureName, reference);
         console.log(`Zipball extract path: ${zipballExtractPath}`);
         if (external_fs_.existsSync(zipballExtractPath)) {
             console.log(`Zipball extract path ${zipballExtractPath} already exists, reusing it.`);
             return zipballExtractPath;
         }
-        installer_log(`Feature ${[featureName, reference, owner, repo].join('-')} has not been downloaded yet, downloading`);
         const octokit = await github_0.getOctokitForOrg(owner);
         const response = await octokit.request('GET /repos/{owner}/{repo}/zipball/{reference}', {
             request: {
@@ -279986,7 +279977,13 @@ async function runRenderer(globalsPath, initializersPath, claimsPath, crsPath, c
     if (claimRefs) {
         claimRefsList = claimRefs.replace(/\s/g, '').split(',');
     }
-    await renderer_render(catalogApp, firestartrApp, validateReferentialIntegrity === 'enabled' ? true : false, claimRefsList);
+    try {
+        await renderer_render(catalogApp, firestartrApp, validateReferentialIntegrity === 'enabled' ? true : false, claimRefsList);
+    }
+    catch (error) {
+        console.log(`Rendering the system: \n ${error}`);
+        process.exit(1);
+    }
     catalogApp.synth();
     firestartrApp.synth();
 }

package/build/packages/catalog_common/src/features/tarballs.d.ts

@@ -1,4 +1,4 @@
-export declare function getFeatureZipDownloadPath(featureName: string, version: string, owner: string, repo: string): string;
-export declare function removeFeatureTarball(featureName: string, version: string, owner: string, repo: string): void;
-export declare function featureTarballExists(featureName: string, version: string, owner: string, repo: string): boolean;
-export declare function getFeaturesExtractPath(featureName: string, version: string, owner: string, repo: string, options?: any): string;
+export declare function getFeatureZipDownloadPath(featureName: string, version: string): string;
+export declare function removeFeatureTarball(featureName: string, version: string): void;
+export declare function featureTarballExists(featureName: string, version: string): boolean;
+export declare function getFeaturesExtractPath(featureName: string, version: string, options?: any): string;

package/build/packages/cdk8s_renderer/src/claims/base/schemas/index.d.ts

@@ -374,7 +374,6 @@ declare const schemas: {
                     };
                     ref: {
                         type: string;
-                        pattern: string;
                         description: string;
                     };
                     args: {

package/build/packages/cdk8s_renderer/src/claims/github/feature.schema.d.ts

@@ -16,7 +16,6 @@ declare const _default: {
                 };
                 ref: {
                     type: string;
-                    pattern: string;
                     description: string;
                 };
                 args: {

package/build/packages/cdk8s_renderer/src/claims/github/index.d.ts

@@ -77,7 +77,6 @@ export declare const GithubSchemas: ({
                 };
                 ref: {
                     type: string;
-                    pattern: string;
                     description: string;
                 };
                 args: {

package/build/packages/features_preparer/src/renderer.d.ts

@@ -1 +1 @@
-export declare function renderFeature(featureName: string, version: string, owner: any, repo: any, featureOwner: any, renderPath?: string, featureArgs?: any): any;
+export declare function renderFeature(featureName: string, version: string, featureOwner: any, renderPath?: string, featureArgs?: any): any;

package/build/packages/github/src/branches.d.ts

@@ -428,7 +428,7 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
                 verified_at: string;
             };
         };
-        author: Record<string, never> | {
+        author: {
             name?: string;
             email?: string;
             login: string;
@@ -451,8 +451,8 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
             site_admin: boolean;
             starred_at?: string;
             user_view_type?: string;
-        };
-        committer: Record<string, never> | {
+        } | Record<string, never>;
+        committer: {
             name?: string;
             email?: string;
             login: string;
@@ -475,7 +475,7 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
             site_admin: boolean;
             starred_at?: string;
             user_view_type?: string;
-        };
+        } | Record<string, never>;
         parents: {
             sha: string;
             url: string;

package/package.json

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