@firestartr/cli 2.11.0-snapshot-features-traceability-01 → 2.11.0-snapshot-import-filter-fix

package/build/index.js

@@ -134117,7 +134117,6 @@ class GithubCheckRun {
         this.pullNumber = params.pullNumber;
         this.includeCheckRunComment = Boolean(params.includeCheckRunComment);
         this.checkRunComment = params.checkRunComment;
-        this.stickyCommentBaseKind = params.stickyCommentBaseKind;
         this.buffer = new CheckRunBuffer('', (data) => this.__updateCheckRun(data).catch(() => { }), { intervalSec: FLUSH_TIMEOUT });
     }
     /**
@@ -134189,13 +134188,7 @@ class GithubCheckRun {
                     text,
                 },
             });
-            // With a shared sticky base kind, the result publisher targeting the
-            // same base kind is always the last word: close() performs no sticky
-            // rewrite (it could otherwise land after the result publish on error
-            // paths and clobber it with a stale progress comment).
-            if (this.includeCheckRunComment &&
-                this.pullNumber !== undefined &&
-                !this.stickyCommentBaseKind) {
+            if (this.includeCheckRunComment && this.pullNumber !== undefined) {
                 try {
                     await this.__ensureAndUpdateStickyComment(this.__buildCheckRunUrl());
                     this.hasCommented = true;
@@ -134260,14 +134253,7 @@ class GithubCheckRun {
                 text,
             },
         });
-        // After the awaits above, close() may have begun. With a shared sticky
-        // base kind the result publisher must be the last word, so an in-flight
-        // progress upsert must not land after it. Legacy flows (no shared base
-        // kind) keep their current behavior.
-        const closedMidFlight = this.stickyCommentBaseKind && (this.closed || this.closing);
-        if (this.includeCheckRunComment &&
-            this.pullNumber !== undefined &&
-            !closedMidFlight) {
+        if (this.includeCheckRunComment && this.pullNumber !== undefined) {
             try {
                 await this.__ensureAndUpdateStickyComment(this.__buildCheckRunUrl());
             }
@@ -134314,7 +134300,7 @@ class GithubCheckRun {
             owner: this.owner,
             repo: this.repo,
             pullNumber: this.pullNumber,
-            baseKind: this.stickyCommentBaseKind ?? `check-run:${this.name}`,
+            baseKind: `check-run:${this.name}`,
             bodies: [linkLine],
         });
     }
@@ -134352,7 +134338,6 @@ async function createCheckRunForOrg(org, owner, repo, name, opts) {
         pullNumber: opts?.pullNumber,
         includeCheckRunComment: Boolean(opts?.includeCheckRunComment),
         checkRunComment: opts?.checkRunComment,
-        stickyCommentBaseKind: opts?.stickyCommentBaseKind,
     });
 }
 async function createCheckRun(owner, repo, name, opts) {
@@ -134805,7 +134790,6 @@ function createFacade(profileName) {
                     pullNumber: opts?.pullNumber,
                     includeCheckRunComment: Boolean(opts?.includeCheckRunComment),
                     checkRunComment: opts?.checkRunComment,
-                    stickyCommentBaseKind: opts?.stickyCommentBaseKind,
                 });
             },
             CheckRun: CheckRun,
@@ -166150,19 +166134,12 @@ function addTraceability(context, src, content) {
 }
 function addTraceabilityStamp(context, content) {
     const traceability = context.traceability || {};
-    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: [${traceability.tags.join(', ')}]`);
-    }
-    const stamp = `${stampLines.join('\n')}\n\n`;
+    const stamp = `---
+# FEATURE_NAME: ${traceability.name}
+# FEATURE_VERSION: ${traceability.version}
+# FEATURE_URL: ${traceability.url}
+
+`;
     const output = [];
     let replaced = false;
     for (const line of content.split(/\n/)) {
@@ -166331,7 +166308,6 @@ function buildExpectedOutput(config, renderDir) {
     return {
         files,
         patches: config.patches || [],
-        traceability: {},
     };
 }
 /* ---------- Context-style API for a render temp dir ---------- */
@@ -166502,7 +166478,6 @@ 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');
@@ -166742,54 +166717,8 @@ featureArgs = {}, repo = 'features', owner = 'prefapp') {
         ref: reference,
         url: `https://github.com/${owner}/${repo}/tree/${reference}/packages/${featureName}`,
     };
-    const commitInfo = await resolveFeatureCommit(owner, repo, reference);
-    featureArgs['traceability'].sha = commitInfo.sha;
-    featureArgs['traceability'].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);
-        // 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.
-        // Tag enumeration is wrapped separately so a pagination failure
-        // still returns the successfully resolved SHA.
-        const tags = [];
-        try {
-            let page = 1;
-            while (true) {
-                const { data: tagList } = await octokit.rest.repos.listTags({
-                    owner,
-                    repo,
-                    per_page: 100,
-                    page,
-                });
-                const matchingTags = tagList.filter((t) => t.commit?.sha === sha);
-                tags.push(...matchingTags.map((t) => t.name));
-                if (tagList.length < 100)
-                    break;
-                page++;
-            }
-        }
-        catch (tagError) {
-            // Clear partial results so consumers don't publish an incomplete
-            // tag set as if it were the full list.
-            tags.length = 0;
-            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);
 }
@@ -166875,20 +166804,11 @@ 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,
-            ref: traceability.ref,
-            repo: traceability.repo,
-            sha: traceability.sha,
-            tags: traceability.tags,
-            url: traceability.url,
-        },
+        feature: { name: featureName, version: featureVersion },
         firestartr: { tfStateKey: cr.spec.firestartr.tfStateKey },
         files,
         claimRepoName,
@@ -170761,23 +170681,6 @@ class FeatureRepoChart extends BaseGithubChart {
                 annotations: {
                     'firestartr.dev/external-name': claim.name,
                     'firestartr.dev/feature-name': claim.feature.name,
-                    ...(claim.feature.sha
-                        ? { 'firestartr.dev/feature-git-sha': claim.feature.sha }
-                        : {}),
-                    ...(claim.feature.tags && claim.feature.tags.length > 0
-                        ? {
-                            'firestartr.dev/feature-git-tags': JSON.stringify(claim.feature.tags),
-                        }
-                        : {}),
-                    ...(claim.feature.url
-                        ? { 'firestartr.dev/feature-url': claim.feature.url }
-                        : {}),
-                    ...(claim.feature.ref
-                        ? { 'firestartr.dev/feature-ref': claim.feature.ref }
-                        : {}),
-                    ...(claim.feature.repo
-                        ? { 'firestartr.dev/feature-repo': claim.feature.repo }
-                        : {}),
                 },
             },
             spec: {
@@ -174224,6 +174127,12 @@ const CHILD_CR_KINDS = [
     'FirestartrGithubRepositorySecretsSection',
     'FirestartrGithubRepositoryFeature',
 ];
+const MAP_COLLECTION_KIND_CR_KIND = {
+    'gh-repo': 'FirestartrGithubRepository',
+    'gh-group': 'FirestartrGithubGroup',
+    'gh-members': 'FirestartrGithubMembership',
+    'gh-org-settings': 'FirestartrGithubOrganizationSettings',
+};
 let previousCRs = {};
 const collections = {
     GroupCollectionGithubDecanter: github_group_collection,
@@ -174232,7 +174141,10 @@ const collections = {
     RepoCollectionGithubDecanter: github_repo_collection,
 };
 function isInPreviousCRs(kind, name) {
-    return `${kind}-${name}` in previousCRs;
+    const crKind = MAP_COLLECTION_KIND_CR_KIND[kind];
+    if (!crKind)
+        return false;
+    return `${crKind}-${name}` in previousCRs;
 }
 const randomFolder = external_path_.join('/tmp', `claims_${catalog_common/* default.generic.randomString */.Z.generic.randomString(10)}`);
 const tmpRenderedCrsPath = external_path_.join('/tmp', '.resources');
@@ -174618,11 +174530,6 @@ async function reimporter_isDirectory(path) {
 
 
 
-//  const MAP_COLLECTION_KIND_CR_KIND: any = {
-//    gh-members: 'FirestartrGithubMembership',
-//    gh-group: 'FirestartrGithubGroup',
-//    gh-repo: 'FirestartrGithubRepository',
-//  }
 async function runImporter(force, skipPlan, claimsPath, crsPath, configPath, claimsDefaultsPath, org, filters, provider = AllowedProviders.all, needsReimport = false) {
     configureProvider(provider);
     let generatedFilters = [];
@@ -363032,28 +362939,6 @@ function operatorProfile() {
     return github["default"].withProfile('operator');
 }
 
-function resolveProgressCommentResource(item) {
-    return { kind: item.kind, name: item.metadata?.name ?? 'unknown' };
-}
-/**
- * Single builder of the sticky base kind shared by the apply progress
- * comment (upserted by the check run while the operation runs) and the
- * final result publisher (which updates that same comment in place).
- * Keyed per resource so claims of the same kind never overwrite each
- * other's feedback.
- */
-function progressCommentBaseKind(cmd, item) {
-    const { kind, name } = resolveProgressCommentResource(item);
-    return `${cmd}:${kind}:${name}`;
-}
-/**
- * Body of the apply progress comment. The check-run module appends the
- * `[here](<check-run-url>)` link to it.
- */
-function progressCommentText(cmd, item) {
-    const { kind, name } = resolveProgressCommentResource(item);
-    return `The ${kind} '${name}' is being processed (cmd=${cmd}). Details: `;
-}
 async function tryPublishApply(item, planOutput, isSuccess = true, exitCode) {
     const kind = item.kind;
     const metadataName = item.metadata?.name ?? 'unknown';
@@ -363107,7 +362992,7 @@ ${commentContent}
             owner: org,
             repo,
             pullNumber: prNumber,
-            baseKind: progressCommentBaseKind('destroy', item),
+            baseKind: `${kind.toLowerCase()}:destroy`,
             bodies: commentBodies,
         });
         operator_src_logger.debug(`The user feedback for the '${item.kind}/${item.metadata.name}' destroy operation has been published as a comment on pull request '${prNumber}'.`);
@@ -363144,7 +363029,7 @@ ${commentContent}
         owner: org,
         repo,
         pullNumber: prNumber,
-        baseKind: progressCommentBaseKind('apply', item),
+        baseKind: `apply:${kind}`,
         bodies: commentBodies,
     });
 }
@@ -363344,12 +363229,7 @@ async function TFCheckRun(cmd, item) {
         const prInfo = extractPrInfo(item);
         const checkRun = await tf_checkrun_operatorProfile().feedback.createCheckRun(prInfo.org, prInfo.repo, helperCreateCheckRunName(cmd, item), {
             pullNumber: Number(prInfo.prNumber),
-            // Apply progress comment: the result publisher updates this same
-            // comment in place when the operation ends (shared sticky base
-            // kind keyed per resource).
-            includeCheckRunComment: true,
-            checkRunComment: progressCommentText(cmd, item),
-            stickyCommentBaseKind: progressCommentBaseKind(cmd, item),
+            // check-run comments removed: redundant with native checks widget (#1985)
         });
         checkRun.mdOptionsDetails({
             quotes: 'terraform',
@@ -363855,9 +363735,6 @@ async function* process_operation_sync(item, op, handler, syncPolicy, generalPol
     }
 }
 async function* process_operation_markedToDeletion(item, op, handler) {
-    // Apply progress comment: announces the destroy on the wet-repo PR and
-    // streams its output; the result publisher updates it in place at the end.
-    const checkRunCtl = await TFCheckRun('destroy', item);
     let error = false;
     let deps;
     let terraformExecutionStarted = false;
@@ -363922,7 +363799,7 @@ async function* process_operation_markedToDeletion(item, op, handler) {
         deps = await handler.resolveReferences();
         const context = buildProvisionerContext(item, deps, sessionId);
         terraformExecutionStarted = true;
-        const destroyOutput = await runTerraformProvisioner(context, 'destroy', checkRunCtl, undefined, {
+        const destroyOutput = await runTerraformProvisioner(context, 'destroy', null, undefined, {
             tfCacheDir: external_path_.join(TF_CACHES_PATH, `slot_${handler.getSlotInfo().slotId}`),
             hardTimeout: handler.recommendedTimeout(),
             processKilled: (killed) => {
@@ -363959,7 +363836,6 @@ async function* process_operation_markedToDeletion(item, op, handler) {
     catch (e) {
         error = true;
         const { output: errorMsg } = extractErrorDetails(e);
-        checkRunCtl.fnOnError(errorMsg);
         await tryPublishDestroy(item, errorMsg, false);
         await handler.writeTerraformOutputInTfResult(item, errorMsg, 1);
         if (item.metadata.annotations['firestartr.dev/last-state-pr'] || false) {
@@ -368566,11 +368442,6 @@ async function* gh_process_operation_markedToDeletion(item, op, handler) {
         // we close it with an error
         if (checkRunCtl)
             checkRunCtl.fnOnError(errorMsg);
-        // also close the Terraform check run: its periodic flush would
-        // otherwise keep rewriting the apply progress comment after the
-        // final destroy result is published
-        if (checkRunTFCtl)
-            checkRunTFCtl.fnOnError(errorMsg);
         await tryPublishDestroy(item, errorMsg, false);
         await handler.writeTerraformOutputInTfResult(item, errorMsg, errCode ?? 1);
         void handler.error();
@@ -713554,7 +713425,7 @@ const crsStatusSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.11.0-snapshot-features-traceability-01"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.11.0-snapshot-import-filter-fix"}');
 ;// 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,9 +16,6 @@ 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,9 +2,5 @@ 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,20 +19,9 @@ 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/build/packages/github/src/check_run.d.ts

@@ -12,15 +12,6 @@ export interface GithubCheckRunParams {
     pullNumber?: number;
     includeCheckRunComment?: boolean;
     checkRunComment?: string;
-    /**
-     * Optional shared sticky base kind for this check run's sticky PR
-     * comment. When set, progress upserts use this base kind (instead of
-     * the default `check-run:<name>`) and `close()` performs no sticky
-     * rewrite, so an external result publisher targeting the same base
-     * kind is always the last word. When unset, legacy behavior is
-     * unchanged.
-     */
-    stickyCommentBaseKind?: string;
 }
 export declare class GithubCheckRun {
     private readonly octokit;
@@ -33,7 +24,6 @@ export declare class GithubCheckRun {
     private readonly pullNumber?;
     private readonly includeCheckRunComment;
     private readonly checkRunComment?;
-    private readonly stickyCommentBaseKind?;
     private hasCommented;
     private creatingPromise?;
     private closing;
@@ -82,7 +72,6 @@ export declare function createCheckRunForOrg(org: string, owner: string, repo: s
     summary?: string;
     includeCheckRunComment?: boolean;
     checkRunComment?: string;
-    stickyCommentBaseKind?: string;
 }): Promise<GithubCheckRun>;
 export declare function createCheckRun(owner: string, repo: string, name: string, opts?: {
     headSHA?: string;
@@ -92,6 +81,5 @@ export declare function createCheckRun(owner: string, repo: string, name: string
     summary?: string;
     includeCheckRunComment?: boolean;
     checkRunComment?: string;
-    stickyCommentBaseKind?: string;
 }): Promise<GithubCheckRun>;
 export declare const CheckRun: typeof GithubCheckRun;

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

@@ -884,7 +884,6 @@ export declare function withProfile(profileName: string): {
             summary?: string;
             includeCheckRunComment?: boolean;
             checkRunComment?: string;
-            stickyCommentBaseKind?: string;
         }) => Promise<import("./check_run").GithubCheckRun>;
         CheckRun: typeof import("./check_run").GithubCheckRun;
         upsertMultiPartStickyComments: typeof upsertMultiPartStickyComments;

package/build/packages/operator/src/user-feedback-ops/user-feedback-ops.d.ts

@@ -1,26 +1,3 @@
-/**
- * Minimal shape of a CR the apply progress comment needs: its kind and
- * its resource name.
- */
-interface ProgressCommentResource {
-    kind: string;
-    metadata?: {
-        name?: string;
-    };
-}
-/**
- * Single builder of the sticky base kind shared by the apply progress
- * comment (upserted by the check run while the operation runs) and the
- * final result publisher (which updates that same comment in place).
- * Keyed per resource so claims of the same kind never overwrite each
- * other's feedback.
- */
-export declare function progressCommentBaseKind(cmd: string, item: ProgressCommentResource): string;
-/**
- * Body of the apply progress comment. The check-run module appends the
- * `[here](<check-run-url>)` link to it.
- */
-export declare function progressCommentText(cmd: string, item: ProgressCommentResource): string;
 export declare function tryPublishApply(item: any, planOutput: string, isSuccess?: boolean, exitCode?: number): Promise<void>;
 export declare function tryPublishDestroy(item: any, destroyOutput: string, isSuccess?: boolean): Promise<void>;
 export declare function publishApply(item: any, applyOutput: string, isSuccess?: boolean): Promise<void>;
@@ -33,4 +10,3 @@ export declare function extractPrInfo(item: any, annotation?: 'firestartr.dev/la
 export declare function tryPublishError(item: any, reason: string, message: string): Promise<void>;
 export declare function publishError(item: any, reason: string, message: string): Promise<void>;
 export declare function publishPlan(item: any, planOutput: string, prNumber: number, repo: string, org: string, isSuccess?: boolean, operation?: string, source?: string): Promise<void>;
-export {};

package/package.json

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