@firestartr/cli 2.11.0-snapshot-importer-filter-fix-3 → 2.11.0-snapshot-feature-git-traceability-1

package/build/index.js

@@ -166259,12 +166259,19 @@ function addTraceability(context, src, content) {
 }
 function addTraceabilityStamp(context, content) {
     const traceability = context.traceability || {};
-    const stamp = `---
-# FEATURE_NAME: ${traceability.name}
-# FEATURE_VERSION: ${traceability.version}
-# FEATURE_URL: ${traceability.url}
-
-`;
+    const stampLines = [
+        '---',
+        `# FEATURE_NAME: ${traceability.name}`,
+        `# FEATURE_VERSION: ${traceability.version}`,
+        `# FEATURE_URL: ${traceability.url}`,
+    ];
+    if (traceability.sha) {
+        stampLines.push(`# FEATURE_GIT_SHA: "${traceability.sha}"`);
+    }
+    if (Array.isArray(traceability.tags) && traceability.tags.length > 0) {
+        stampLines.push(`# FEATURE_GIT_TAGS: ${JSON.stringify(traceability.tags)}`);
+    }
+    const stamp = `${stampLines.join('\n')}\n\n`;
     const output = [];
     let replaced = false;
     for (const line of content.split(/\n/)) {
@@ -166433,6 +166440,7 @@ function buildExpectedOutput(config, renderDir) {
     return {
         files,
         patches: config.patches || [],
+        traceability: {},
     };
 }
 /* ---------- Context-style API for a render temp dir ---------- */
@@ -166603,6 +166611,7 @@ function render(featurePath, featureRenderPath, entity, firestartrConfig = {}, f
         // Not used anymore
         // output.unpatches = context.config.unpatches
     });
+    output.traceability = context.traceability;
     external_fs_default().writeFileSync(external_path_default().join(featureRenderPath, 'config.json'), JSON.stringify(context.config));
     // write the output file
     const configFile = external_path_default().join(featureRenderPath, 'output.json');
@@ -166834,6 +166843,7 @@ featureArgs = {}, repo = 'features', owner = 'prefapp') {
 async function processFeature(featureName, reference, featureOwner, // -> cr
 featureArgs = {}, repo = 'features', owner = 'prefapp') {
     await downloadFeatureZip(repo, featureName, reference, owner);
+    const commitInfo = await resolveFeatureCommit(owner, repo, reference);
     featureArgs['traceability'] = {
         version: reference,
         owner,
@@ -166841,9 +166851,44 @@ featureArgs = {}, repo = 'features', owner = 'prefapp') {
         name: featureName,
         ref: reference,
         url: `https://github.com/${owner}/${repo}/tree/${reference}/packages/${featureName}`,
+        sha: commitInfo.sha,
+        tags: commitInfo.tags,
     };
     return renderFeature(featureName, reference, owner, repo, featureOwner, '/tmp', featureArgs);
 }
+async function resolveFeatureCommit(owner, repo, reference) {
+    try {
+        const octokit = await github["default"].getOctokitForOrg(owner, true);
+        // Get the resolved commit SHA
+        const { data: commit } = await octokit.rest.repos.getCommit({
+            owner,
+            repo,
+            ref: reference,
+        });
+        const sha = commit.sha;
+        // Get all tags pointing to this commit. `paginate` is all-or-nothing:
+        // if listing fails, we still return the resolved SHA with an empty tag set.
+        let tags = [];
+        try {
+            const allTags = await octokit.paginate(octokit.rest.repos.listTags, {
+                owner,
+                repo,
+                per_page: 100,
+            });
+            tags = allTags
+                .filter((t) => t.commit?.sha === sha)
+                .map((t) => t.name);
+        }
+        catch (tagError) {
+            features_preparer_src_logger.warn(`[features_preparer] Failed to list tags for ${owner}/${repo}@${reference}: ${tagError instanceof Error ? tagError.message : String(tagError)}`);
+        }
+        return { sha, tags };
+    }
+    catch (error) {
+        features_preparer_src_logger.warn(`[features_preparer] Failed to resolve commit for ${owner}/${repo}@${reference}: ${error instanceof Error ? error.message : String(error)}`);
+        return { sha: '', tags: [] };
+    }
+}
 async function prepareFeature(featureName, version, repo = 'features', owner = 'prefapp') {
     await downloadFeatureZip(repo, featureName, version, owner);
 }
@@ -166929,11 +166974,20 @@ async function utils_renderFeature(featureName, featureVersion, featureOutputObj
         files.push({ path, userManaged, content, targetBranch });
     }
     const featName = catalog_common/* default.generic.normalizeName */.Z.generic.normalizeName(`${featureName}-${cr.spec.firestartr.tfStateKey}`);
+    const traceability = featureOutputObject.traceability || {};
     return {
         kind: 'GithubRepositoryFeatureClaim',
         version: '1.0.0',
         name: featName,
-        feature: { name: featureName, version: featureVersion },
+        feature: {
+            name: featureName,
+            version: featureVersion,
+            ref: traceability.ref,
+            repo: traceability.repo,
+            sha: traceability.sha,
+            tags: traceability.tags,
+            url: traceability.url,
+        },
         firestartr: { tfStateKey: cr.spec.firestartr.tfStateKey },
         files,
         claimRepoName,
@@ -170800,13 +170854,29 @@ class FeatureRepoChart extends BaseGithubChart {
     template() {
         const claim = this.get('claim');
         const repositoryTarget = this.resolveRepositoryTarget();
+        const annotations = {
+            'firestartr.dev/external-name': claim.name,
+            'firestartr.dev/feature-name': claim.feature.name,
+        };
+        if (claim.feature.sha) {
+            annotations['firestartr.dev/feature-git-sha'] = claim.feature.sha;
+        }
+        if (claim.feature.tags?.length) {
+            annotations['firestartr.dev/feature-git-tags'] = JSON.stringify(claim.feature.tags);
+        }
+        if (claim.feature.url) {
+            annotations['firestartr.dev/feature-url'] = claim.feature.url;
+        }
+        if (claim.feature.ref) {
+            annotations['firestartr.dev/feature-ref'] = claim.feature.ref;
+        }
+        if (claim.feature.repo) {
+            annotations['firestartr.dev/feature-repo'] = claim.feature.repo;
+        }
         const cr = {
             metadata: {
                 name: claim.name,
-                annotations: {
-                    'firestartr.dev/external-name': claim.name,
-                    'firestartr.dev/feature-name': claim.feature.name,
-                },
+                annotations,
             },
             spec: {
                 context: claim.context,
@@ -170826,7 +170896,7 @@ class FeatureRepoChart extends BaseGithubChart {
                 },
             },
         };
-        const annotations = this.getAnnotationsFromRepo(this.get('repoCr'), [
+        const repoAnnotations = this.getAnnotationsFromRepo(this.get('repoCr'), [
             'claim-ref',
             'revision',
             'sync-enabled',
@@ -170834,7 +170904,7 @@ class FeatureRepoChart extends BaseGithubChart {
         ]);
         cr.metadata.annotations = {
             ...cr.metadata.annotations,
-            ...annotations,
+            ...repoAnnotations,
         };
         // We do this to remove undefined variables from the template
         const crTemplate = JSON.parse(JSON.stringify(cr, null, 2));
@@ -713893,7 +713963,7 @@ const crsStatusSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.11.0-snapshot-importer-filter-fix-3"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.11.0-snapshot-feature-git-traceability-1"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.10.0"};
 // EXTERNAL MODULE: ../../node_modules/semver/index.js

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

@@ -16,6 +16,9 @@ export interface IGithubRepositoryFeatureClaim extends IClaim {
         version?: string;
         ref?: string;
         repo?: string;
+        sha?: string;
+        tags?: string[];
+        url?: string;
     };
     repositoryTarget: FirestartrGithubRepositoryFeatureSpecRepositoryTarget;
     files: Array<IGithubRepositoryFeatureFileClaim>;

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

@@ -2,5 +2,9 @@ export declare function getFeatureConfigFromRef(featureName: string, featureRef:
 featureArgs?: any, repo?: string, owner?: string): Promise<any>;
 export declare function getFeatureConfig(featureName: string, version: string, featureOwner: any, // -> cr
 featureArgs?: any, repo?: string, owner?: string): Promise<any>;
+export declare function resolveFeatureCommit(owner: string, repo: string, reference: string): Promise<{
+    sha: string;
+    tags: string[];
+}>;
 export declare function prepareFeature(featureName: string, version: string, repo?: string, owner?: string): Promise<void>;
 export declare function downloadFeatureZip(repo: string, featureName: string, reference: string, owner?: string): Promise<string>;

package/build/packages/features_renderer/src/auxiliar.d.ts

@@ -19,9 +19,20 @@ export interface ExpectedFile {
     targetBranch: string;
     userManaged: boolean;
 }
+export interface Traceability {
+    owner?: string;
+    repo?: string;
+    name?: string;
+    version?: string;
+    ref?: string;
+    url?: string;
+    sha?: string;
+    tags?: string[];
+}
 export interface ExpectedOutput {
     files: ExpectedFile[];
     patches: unknown[];
+    traceability?: Traceability;
 }
 export interface RenderTest {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "2.11.0-snapshot-importer-filter-fix-3",
+  "version": "2.11.0-snapshot-feature-git-traceability-1",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",