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

package/build/index.js

@@ -262837,7 +262837,7 @@ const TFWorkspaceRefRegex = new RegExp(`\\$\\{\\{\\s*tfworkspace\\:(${regModuleN
 const SecretRefRegex = new RegExp(`\\$\\{\\{\\s*secret\\:(${regModuleName.source})\\.(${regModuleName.source})\\s*\\}\\}`, 'ig');
 const GroupRefRegex = new RegExp(`group\\:(${regModuleName.source})`, 'ig');
 const TFWorkspaceRefCR = new RegExp(`\\$\\{\\{\\s*references\\.(${regModuleName.source})\\s*\\}\\}`, 'i');
-const GenericRefRegex = new RegExp(`user:${regModuleName.source}|group:${regModuleName.source}|system:${regModuleName.source}`, 'gm');
+const GenericRefRegex = new RegExp(`^["']?(user:${regModuleName.source}|group:${regModuleName.source}|system:${regModuleName.source})["']?$`, 'gm');
 const YAMLHeaderRegex = new RegExp(/^\s*(\w+:\s?)/);
 const YAMLListItemRegex = new RegExp(/^\s*(-\s)/);
 const YAMLInlineListRegex = new RegExp(/^\s*(\[.+\])/);
@@ -263047,26 +263047,26 @@ const fullMembersTeam = getFromEnvironmentWithDefault(envVars.fullOrgGroup, `${o
 
 
 const tarballs_messageLog = src_default()('firestartr:catalog_common:features:tarballs');
-function getFeatureZipDownloadPath(featureName, version) {
-    const featureDownloadPath = `/tmp/${featureName}-${version}-zipball.zip`;
+function getFeatureZipDownloadPath(featureName, version, owner, repo) {
+    const featureDownloadPath = `/tmp/${basicFeaturePath(featureName, version, owner, repo)}-zipball.zip`;
     tarballs_messageLog('Feature tarball download path %s', featureDownloadPath);
     return featureDownloadPath;
 }
-function removeFeatureTarball(featureName, version) {
-    const featurePath = getFeatureZipDownloadPath(featureName, version);
+function removeFeatureTarball(featureName, version, owner, repo) {
+    const featurePath = getFeatureZipDownloadPath(featureName, version, owner, repo);
     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) {
-    const featurePath = getFeatureZipDownloadPath(featureName, version);
+function featureTarballExists(featureName, version, owner, repo) {
+    const featurePath = getFeatureZipDownloadPath(featureName, version, owner, repo);
     const exists = external_fs_.existsSync(featurePath);
     tarballs_messageLog(`Tarball ${featurePath} exists? ${exists}`);
     return exists;
 }
-function getFeaturesExtractPath(featureName, version, options = {}) {
+function getFeaturesExtractPath(featureName, version, owner, repo, options = {}) {
     const { createIfNotExists } = options;
-    const extractPath = `/tmp/${featureName}-${version}-extract`;
+    const extractPath = `/tmp/${basicFeaturePath(featureName, version, owner, repo)}-extract`;
     tarballs_messageLog('Extract path %s', extractPath);
     if (createIfNotExists && !external_fs_.existsSync(extractPath)) {
         tarballs_messageLog('Extract path %s does not exist, creating', extractPath);
@@ -263074,6 +263074,13 @@ function getFeaturesExtractPath(featureName, version, 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
 
@@ -263081,7 +263088,7 @@ function getFeaturesExtractPath(featureName, version, options = {}) {
 
 const features_io_messageLog = src_default()('firestartr:catalog_common:features:features_io');
 function getFeatureRenderedPathForEntity(entity, featureName, basePath = '/tmp') {
-    const entityFolderName = `${entity.kind}-${entity.metadata.name}`.toLowerCase();
+    const entityFolderName = `${entity.metadata.name}`.toLowerCase();
     return external_path_default().join(basePath, entityFolderName, featureName);
 }
 function getFeatureRenderedConfigForComponent(entity, featureName, basePath = '/tmp/features') {
@@ -272917,6 +272924,7 @@ class FirestartrAllClaim {
                 },
                 ref: {
                     type: 'string',
+                    pattern: '^[a-zA-Z0-9-._@/]+$',
                     description: 'A github reference (commit, tag, branch)',
                 },
                 args: {
@@ -275769,8 +275777,8 @@ function updateFileContent(featureRenderPath, filePath, content) {
 
 
 const renderer_messageLog = src_default()('firestartr:features_preparer:renderer');
-function renderFeature(featureName, version, featureOwner, renderPath = '/tmp', featureArgs = {}) {
-    const extractPath = external_path_default().join(catalog_common.features.tarballs.getFeaturesExtractPath(featureName, version), 'packages', featureName);
+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);
     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);
@@ -275810,6 +275818,8 @@ 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
@@ -275832,19 +275842,20 @@ featureArgs = {}, repo = 'features', owner = 'prefapp') {
         ref: reference,
         url: `https://github.com/${owner}/${repo}/tree/${reference}/packages/${featureName}`,
     };
-    return renderFeature(featureName, reference, featureOwner, '/tmp', featureArgs);
+    return renderFeature(featureName, reference, owner, repo, 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);
+        const zipballExtractPath = catalog_common.features.tarballs.getFeaturesExtractPath(featureName, reference, owner, repo, { createIfNotExists: false });
         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: {

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

@@ -1,4 +1,4 @@
-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;
+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;

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

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

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

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

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

@@ -77,6 +77,7 @@ 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, featureOwner: any, renderPath?: string, featureArgs?: any): any;
+export declare function renderFeature(featureName: string, version: string, owner: any, repo: any, 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: {
+        author: Record<string, never> | {
             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;
-        } | Record<string, never>;
-        committer: {
+        };
+        committer: Record<string, never> | {
             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-10",
+  "version": "1.45.0-snapshot-12",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",