@firestartr/cli 1.50.1-snapshot-32 → 1.50.1-snapshot-33

package/build/index.js

@@ -289786,18 +289786,12 @@ function fromYaml(data) {
 }
 function toYaml(data, opts = {}) {
     src_logger.debug('opts', opts);
-    const result = yaml_dist.stringify(data, {
-        defaultKeyType: 'PLAIN',
-        defaultStringType: 'QUOTE_DOUBLE',
-    });
+    const result = yaml_dist.stringify(data);
     return result;
 }
 function dumpYaml(data) {
     src_logger.debug('Dumping object data to YAML %O', data);
-    return yaml_dist.stringify(data, {
-        defaultKeyType: 'PLAIN',
-        defaultStringType: 'QUOTE_DOUBLE',
-    });
+    return yaml_dist.stringify(data);
 }
 
 // EXTERNAL MODULE: external "child_process"
@@ -298377,16 +298371,13 @@ async function getOrgTeamsDirectAccess(org) {
       }
     }
   }`);
-    console.dir("--- 🚀 GraphQL response:");
-    console.dir(response, { depth: null });
     return transformGraphQLResponse(response);
 }
-;
 function transformGraphQLResponse(response) {
     const teams = response?.organization?.teams?.nodes;
     if (!teams)
         return {};
-    let result = {
+    const result = {
         repositories: {},
         teams: {},
     };
@@ -298404,8 +298395,6 @@ function transformGraphQLResponse(response) {
             result.repositories[repoName][teamName] = permission;
         });
     });
-    console.log("--- 🚀 Transformed GraphQL response:");
-    console.dir(result, { depth: null });
     return result;
 }
 async function getOrgPlanName(org) {
@@ -298701,20 +298690,141 @@ async function getUserInfo(name) {
     getUserInfo,
 });
 
+;// CONCATENATED MODULE: ../github/src/sticky_comment.ts
+const locks = new Map();
+async function withLock(key, fn) {
+    const prev = locks.get(key) ?? Promise.resolve();
+    let release;
+    const next = new Promise((r) => (release = r));
+    locks.set(key, prev.then(() => next));
+    await prev;
+    try {
+        return await fn();
+    }
+    finally {
+        release();
+        if (locks.get(key) === next)
+            locks.delete(key);
+    }
+}
+// helpers
+function escapeForRegex(s) {
+    return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+function prIdRegex(kind) {
+    return new RegExp(`<!-- sticky-id:${escapeForRegex(kind)}=(\\d+) -->`);
+}
+function prIdMarker(kind, id) {
+    return `<!-- sticky-id:${kind}=${id} -->`;
+}
+function bodyMarker(kind) {
+    return `<!-- sticky:kind=${kind} -->`;
+}
+async function readStickyIdFromPrBody(octokit, owner, repo, pr, kind) {
+    const prResp = await octokit.rest.pulls.get({ owner, repo, pull_number: pr });
+    const body = prResp.data?.body ?? '';
+    const m = body.match(prIdRegex(kind));
+    return m ? Number(m[1]) : undefined;
+}
+async function writeStickyIdToPrBody(octokit, owner, repo, pr, kind, id) {
+    const get = await octokit.rest.pulls.get({ owner, repo, pull_number: pr });
+    const body = get.data?.body ?? '';
+    const rx = prIdRegex(kind);
+    const marker = prIdMarker(kind, id);
+    const next = rx.test(body)
+        ? body.replace(rx, marker)
+        : body
+            ? `${body}\n${marker}`
+            : marker;
+    if (next !== body) {
+        await octokit.rest.pulls.update({
+            owner,
+            repo,
+            pull_number: pr,
+            body: next,
+        });
+    }
+}
+async function upsertStickyComment(octokit, params) {
+    const { owner, repo, pullNumber, kind } = params;
+    const fullBody = `${params.body}\n\n${bodyMarker(kind)}`;
+    const lockKey = `${owner}/${repo}#${pullNumber}#${kind}`;
+    await withLock(lockKey, async () => {
+        // 1) PR-body registry fast path
+        const idFromPr = await readStickyIdFromPrBody(octokit, owner, repo, pullNumber, kind);
+        if (idFromPr) {
+            await octokit.rest.issues.updateComment({
+                owner,
+                repo,
+                comment_id: idFromPr,
+                body: fullBody,
+            });
+            return;
+        }
+        // 2) Try to find an existing comment by kind marker
+        try {
+            const all = await octokit.paginate(octokit.rest.issues.listComments, {
+                owner,
+                repo,
+                issue_number: pullNumber,
+                per_page: 100,
+            });
+            const marker = bodyMarker(kind);
+            const hit = all.find((c) => typeof c.body === 'string' && c.body.includes(marker));
+            if (hit?.id) {
+                await octokit.rest.issues.updateComment({
+                    owner,
+                    repo,
+                    comment_id: hit.id,
+                    body: fullBody,
+                });
+                await writeStickyIdToPrBody(octokit, owner, repo, pullNumber, kind, hit.id);
+                return;
+            }
+        }
+        catch {
+            // if paginate/listComments not available, we'll fall back to creating
+        }
+        // 3) Create new comment and register
+        const created = await octokit.rest.issues.createComment({
+            owner,
+            repo,
+            issue_number: pullNumber,
+            body: fullBody,
+        });
+        const newId = created?.data?.id;
+        if (newId !== undefined) {
+            await writeStickyIdToPrBody(octokit, owner, repo, pullNumber, kind, newId);
+        }
+    });
+}
+
 ;// CONCATENATED MODULE: ../github/src/pull_request.ts
 
 
+
 const commentMaxSize = 65535;
-async function commentInPR(comment, pr_number, repo, owner = 'prefapp') {
+async function commentInPR(comment, pr_number, repo, owner = 'prefapp', stickyKind) {
     try {
         github_src_logger.info(`Commenting ${comment} in PR ${pr_number} of ${owner}/${repo}`);
         const octokit = await getOctokitForOrg(owner);
-        await octokit.rest.issues.createComment({
-            owner,
-            repo,
-            issue_number: pr_number,
-            body: comment,
-        });
+        if (stickyKind) {
+            await upsertStickyComment(octokit, {
+                owner,
+                repo,
+                pullNumber: pr_number,
+                kind: stickyKind,
+                body: comment,
+            });
+        }
+        else {
+            await octokit.rest.issues.createComment({
+                owner,
+                repo,
+                issue_number: pr_number,
+                body: comment,
+            });
+        }
     }
     catch (e) {
         console.error(`Error commenting in PR: ${e}`);
@@ -298944,6 +299054,7 @@ async function createOrphanBranch(repo, branch, owner = 'prefapp') {
 
 
 
+
 const FLUSH_TIMEOUT = 4; // seconds
 const GITHUB_OUTPUT_TEXT_LIMIT = 65000; // ~65k hard limit for output.text
 /**
@@ -299078,6 +299189,15 @@ class GithubCheckRun {
                     text,
                 },
             });
+            if (this.includeCheckRunComment && this.pullNumber !== undefined) {
+                try {
+                    await this.__ensureAndUpdateStickyComment(this.__buildCheckRunUrl());
+                    this.hasCommented = true;
+                }
+                catch {
+                    github_src_logger.warn('Error creating check run comment');
+                }
+            }
             this.closed = true;
         }
         catch (e) {
@@ -299091,42 +299211,36 @@ class GithubCheckRun {
     async __ensureCreated() {
         if (this.checkRunId)
             return;
-        const startedAt = new Date().toISOString();
-        const res = await this.octokit.rest.checks.create({
-            owner: this.owner,
-            repo: this.repo,
-            name: this.name,
-            head_sha: this.headSHA,
-            status: 'in_progress',
-            started_at: startedAt,
-            details_url: this.detailsUrl,
-            output: {
-                title: this.title,
-                summary: this._summaryOverride ?? '',
-                text: undefined,
-            },
-        });
-        this.checkRunId = res.data.id;
-        if (this.includeCheckRunComment &&
-            this.pullNumber !== undefined &&
-            !this.hasCommented) {
-            const link = this.__buildCheckRunUrl();
-            const formattedLink = `[here](${link})`;
-            const base = this.checkRunComment ?? '';
-            const body = base ? `${base}${formattedLink}` : formattedLink;
-            await this.octokit.rest.issues.createComment({
+        if (this.creatingPromise)
+            return this.creatingPromise;
+        this.creatingPromise = (async () => {
+            const startedAt = new Date().toISOString();
+            const res = await this.octokit.rest.checks.create({
                 owner: this.owner,
                 repo: this.repo,
-                issue_number: this.pullNumber,
-                body,
+                name: this.name,
+                head_sha: this.headSHA,
+                status: 'in_progress',
+                started_at: startedAt,
+                details_url: this.detailsUrl,
+                output: {
+                    title: this.title,
+                    summary: this._summaryOverride ?? '',
+                    text: undefined,
+                },
             });
-            this.hasCommented = true;
+            this.checkRunId = res.data.id;
+        })();
+        try {
+            await this.creatingPromise;
+        }
+        finally {
+            this.creatingPromise = undefined;
         }
     }
     async __updateCheckRun(allContent) {
         if (this.closed || this.closing)
             return;
-        await this.__ensureCreated();
         const { text, summary } = this.buildOutputTextAndSummary(allContent);
         await this.octokit.rest.checks.update({
             owner: this.owner,
@@ -299139,6 +299253,14 @@ class GithubCheckRun {
                 text,
             },
         });
+        if (this.includeCheckRunComment && this.pullNumber !== undefined) {
+            try {
+                await this.__ensureAndUpdateStickyComment(this.__buildCheckRunUrl());
+            }
+            catch (e) {
+                github_src_logger.warn('Error updating check run comment:', e);
+            }
+        }
     }
     __buildCheckRunUrl() {
         if (this.checkRunId) {
@@ -299168,6 +299290,20 @@ class GithubCheckRun {
         }
         return { text, summary };
     }
+    // Ensure a sticky comment exists and rewrite it entirely with the latest content.
+    async __ensureAndUpdateStickyComment(link) {
+        if (!this.includeCheckRunComment || this.pullNumber === undefined)
+            return;
+        const base = this.checkRunComment ?? '';
+        const linkLine = base ? `${base}[here](${link})` : `[here](${link})`;
+        await upsertStickyComment(this.octokit, {
+            owner: this.owner,
+            repo: this.repo,
+            pullNumber: this.pullNumber,
+            kind: `check-run:${this.name}`,
+            body: linkLine,
+        });
+    }
 }
 // -------------------- Helpers --------------------
 function truncateRight(s, max) {
@@ -299185,11 +299321,12 @@ async function createCheckRunForOrg(org, owner, repo, name, opts) {
     const pr = opts?.pullNumber;
     const hasValidPrNumber = typeof pr === 'number' && Number.isInteger(pr) && pr > 0;
     if (!headSHA && hasValidPrNumber) {
-        headSHA = await getPrMergeCommitSHA(opts.pullNumber, repo, owner);
+        headSHA = await getPrMergeCommitSHA(pr, repo, owner);
     }
     if (!headSHA) {
         throw new Error('createCheckRunForOrg: either opts.headSHA or opts.pullNumber must be provided');
     }
+    github_src_logger.debug(`Creating check run ${name} in ${owner}/${repo} at ${headSHA}`);
     return new GithubCheckRun(octokit, {
         owner,
         repo,
@@ -299204,6 +299341,7 @@ async function createCheckRunForOrg(org, owner, repo, name, opts) {
     });
 }
 async function createCheckRun(owner, repo, name, opts) {
+    github_src_logger.debug(`Creating check run ${name} in ${owner}/${repo}`);
     return createCheckRunForOrg(owner, owner, repo, name, opts);
 }
 const CheckRun = GithubCheckRun;
@@ -310215,9 +310353,6 @@ class RepoGithubDecanter extends GithubDecanter {
         }
     }
     __decantRelations() {
-        importer_src_logger.debug("Decanting repo's relations...");
-        console.dir(this.data.teamsAndMembers, { depth: null });
-        importer_src_logger.debug("Decanting maintainers...");
         const directMaintainers = this.data.teamsAndMembers.directMembers
             .filter((member) => member.role === 'maintain')
             .map((member) => {
@@ -310243,7 +310378,6 @@ class RepoGithubDecanter extends GithubDecanter {
                 path: '/maintainedBy',
             });
         }
-        importer_src_logger.debug("Decanting admins...");
         const directAdmins = this.data.teamsAndMembers.directMembers
             .filter((member) => member.role === 'admin')
             .map((member) => {
@@ -310279,7 +310413,6 @@ class RepoGithubDecanter extends GithubDecanter {
                 path: '/providers/github/overrides',
             });
         }
-        importer_src_logger.debug("Decanting writers...");
         const directWriters = this.data.teamsAndMembers.directMembers
             .filter((member) => member.role === 'push')
             .map((member) => {
@@ -310295,8 +310428,6 @@ class RepoGithubDecanter extends GithubDecanter {
             .map((team) => {
             return `group:${team.name}`;
         });
-        console.log("--- 🚀 Team writers:");
-        console.dir(teamWriters, { depth: null });
         const writers = directWriters.concat(outsideWriters).concat(teamWriters);
         if (writers && writers.length > 0) {
             overrides['additionalWriters'] = writers;
@@ -310306,7 +310437,6 @@ class RepoGithubDecanter extends GithubDecanter {
                 path: '/providers/github/overrides',
             });
         }
-        importer_src_logger.debug("Decanting readers...");
         const directReaders = this.data.teamsAndMembers.directMembers
             .filter((member) => member.role === 'pull')
             .map((member) => {
@@ -310335,13 +310465,11 @@ class RepoGithubDecanter extends GithubDecanter {
     async __gatherRepoTeamsAndMembers() {
         this.data['teamsAndMembers'] = {};
         const directMembers = (await github_0.repo.getCollaborators(this.data.repoDetails.owner.login, this.data.repoDetails.name, 'direct')).map((member) => {
-            return { name: member.login, slug: member.slug, role: member.role_name };
+            return { name: member.login, role: member.role_name };
         });
         const outsideMembers = (await github_0.repo.getCollaborators(this.data.repoDetails.owner.login, this.data.repoDetails.name, 'outside')).map((member) => {
             return { name: member.login, role: member.role_name };
         });
-        console.debug("--- 🚀 Gathered repo's teams and members:");
-        console.dir(this.githubTeams, { depth: null });
         const teams = Object.keys(this.githubTeams).map((teamName) => {
             return {
                 name: teamName,
@@ -310506,8 +310634,6 @@ class RepoCollectionGithubDecanter extends GithubDecanter {
         const filteredRepos = await this.filter(RepoCollectionGithubDecanter.collectionKind, filters, repoList.map((repo) => repo.name));
         for (const repoName of filteredRepos) {
             const repoInfo = await this.github.repo.getRepoInfo(this.org, repoName);
-            console.log(`--- 🚀 Processing repo: ${repoName}`);
-            console.dir(directAccessRepos, { depth: null });
             repos.push(new RepoGithubDecanter({ repoDetails: repoInfo }, this.org, directAccessRepos?.[repoName]));
         }
         this.data['collection'] = repos;
@@ -311531,7 +311657,7 @@ async function writePlanInGithubPR(prUrl, planText) {
     ${planText}
     \`\`\`
     `;
-        await github_0.pulls.commentInPR(message, +pr_number, repo, owner);
+        await github_0.pulls.commentInPR(message, +pr_number, repo, owner, 'logs');
     }
     catch (err) {
         operator_src_logger.error(`writePlanInGithubPR: Cannot write plan in PR: ${err}`);
@@ -311629,7 +311755,6 @@ async function updateDryRun(manifest, namespace) {
 
 
 
-
 /**
  * Execute the callbacks for each item in the store
  * @param {string} plural - Kind to observe
@@ -311686,7 +311811,9 @@ async function observe(plural, namespace, onAdd, onChange, onDelete, _onRename)
             operator_src_logger.error(`An error occurred in the reflector for '${plural}' in namespace '${namespace}': '${err}'.`);
             setTimeout(async () => {
                 try {
+                    operator_src_logger.warn(`Trying to recover from the error: "${err}" for '${plural}' in '${namespace}'`);
                     await informer.start();
+                    operator_src_logger.warn(`Recovered from the error: "${err}" for '${plural}' in '${namespace}'`);
                 }
                 catch (err) {
                     operator_src_logger.error(`Failed to start the reflector informer for '${plural}' in namespace '${namespace}': '${err}'.`);
@@ -311696,9 +311823,8 @@ async function observe(plural, namespace, onAdd, onChange, onDelete, _onRename)
         await informer.start();
     }
     catch (err) {
-        console.error(`Observing: ${plural}: ${err}`);
-        catalog_common.io.writeFunctionLog('observer', `Error Observing: ${plural}: ${err}`);
-        throw `Observing: ${plural}: ${err}`;
+        operator_src_logger.error(`Observing: ${plural}: ${err}`);
+        throw new Error(`Observing: ${plural}: ${err}`);
     }
 }
 
@@ -314653,7 +314779,7 @@ async function tryPublishDestroy(item, destroyOutput) {
         let currentCommentNo = 1;
         for (const commentContent of dividedOutput) {
             const comment = `<h1>
-<img  width="25"  src="https://static-00.iconduck.com/assets.00/file-type-terraform-icon-1821x2048-mbxeegff.png"> Terraform destroy
+<img  width="25"  src="https://raw.githubusercontent.com/firestartr-pro/docs/refs/heads/main/logos/square-nobg.png"> Destroy Finished
 </h1>
 <p><b>TFWorkspace: </b>${item.metadata.name}</p>
 
@@ -314665,7 +314791,7 @@ ${commentContent}
 \`\`\`
 </details>`;
             operator_src_logger.debug(`The user feedback for item '${item.kind}/${item.metadata.name}' is being published as a comment on pull request '${lastPr.number}' for repository '${repo}' in organization '${org}'.`);
-            await github_0.pulls.commentInPR(comment, lastPr.number, repo, org);
+            await github_0.pulls.commentInPR(comment, lastPr.number, repo, org, 'logs');
             operator_src_logger.debug(`The user feedback for the '${item.kind}/${item.metadata.name}' destroy operation is being published as a comment on pull request '${lastPr.number}'.`);
             currentCommentNo += 1;
         }
@@ -314680,7 +314806,7 @@ async function publishApply(item, applyOutput, kind) {
     let currentCommentNo = 1;
     for (const commentContent of dividedOutput) {
         const comment = `<h1>
-<img  width="25"  src="https://static-00.iconduck.com/assets.00/file-type-terraform-icon-1821x2048-mbxeegff.png"> Terraform apply
+<img  width="25"  src="https://raw.githubusercontent.com/firestartr-pro/docs/refs/heads/main/logos/square-nobg.png"> Apply Finished
 </h1>
 <p><b>${kind}: </b>${item.metadata.name}</p>
 
@@ -314691,7 +314817,7 @@ async function publishApply(item, applyOutput, kind) {
 ${commentContent}
 \`\`\`
 </details>`;
-        await github_0.pulls.commentInPR(comment, parseInt(prNumber), repo, org);
+        await github_0.pulls.commentInPR(comment, parseInt(prNumber), repo, org, 'logs');
         currentCommentNo += 1;
     }
 }
@@ -314740,7 +314866,7 @@ async function publishError(item, reason, message) {
 #### ℹ️ Details:
 ${message}
 `;
-    await github_0.pulls.commentInPR(comment, parseInt(prNumber), repo, org);
+    await github_0.pulls.commentInPR(comment, parseInt(prNumber), repo, org, 'logs');
 }
 async function publishPlan(item, planOutput, prNumber, repo, org) {
     try {
@@ -314748,7 +314874,7 @@ async function publishPlan(item, planOutput, prNumber, repo, org) {
         let currentCommentNo = 1;
         for (const commentContent of dividedOutput) {
             const comment = `<h1>
-<img  width="25"  src="https://static-00.iconduck.com/assets.00/file-type-terraform-icon-1821x2048-mbxeegff.png"> Terraform plan
+<img  width="25"  src="https://raw.githubusercontent.com/firestartr-pro/docs/refs/heads/main/logos/square-nobg.png"> Plan Finished
 </h1>
 <p><b>TFWorkspace: </b>${item.metadata.name}</p>
 
@@ -314759,7 +314885,7 @@ async function publishPlan(item, planOutput, prNumber, repo, org) {
 ${commentContent}
 \`\`\`
 </details>`;
-            await github_0.pulls.commentInPR(comment, prNumber, repo, org);
+            await github_0.pulls.commentInPR(comment, prNumber, repo, org, 'logs');
             currentCommentNo += 1;
         }
     }
@@ -314798,7 +314924,7 @@ async function GHCheckRun(cmd, item) {
     };
 }
 function helperCreateCheckRunName(cmd, item) {
-    return `Github Provisioner / ${item.kind} - ${cmd}`;
+    return `${item.kind} - ${cmd}`;
 }
 function gh_checkrun_extractPrInfo(item) {
     const prInfo = item.metadata.annotations['firestartr.dev/last-state-pr'];
@@ -314951,7 +315077,7 @@ async function* markedToDeletion(item, op, handler) {
                     },
                     logStreamCallbacksTF: {
                         prepare: async () => {
-                            checkRunCtl = await GHCheckRun('terraform destroy', item);
+                            checkRunCtl = await GHCheckRun('destroy', item);
                             return checkRunCtl;
                         },
                     },
@@ -315075,7 +315201,7 @@ async function* doApply(item, op, handler) {
                     },
                     logStreamCallbacksTF: {
                         prepare: async () => {
-                            checkRunCtl = await GHCheckRun('terraform apply', item);
+                            checkRunCtl = await GHCheckRun('apply', item);
                             return checkRunCtl;
                         },
                     },
@@ -317511,7 +317637,7 @@ async function processOperationPlan_publishPlan(item, planOutput) {
         let currentCommentNo = 1;
         for (const commentContent of dividedOutput) {
             const comment = `<h1>
-  <img  width="25"  src="https://static-00.iconduck.com/assets.00/file-type-terraform-icon-1821x2048-mbxeegff.png"> Terraform plan
+  <img  width="25"  src="https://raw.githubusercontent.com/firestartr-pro/docs/refs/heads/main/logos/square-nobg.png"> Plan Finished
   </h1>
   <p><b>TFWorkspace: </b>${item.metadata.name}</p>
 
@@ -317522,7 +317648,7 @@ async function processOperationPlan_publishPlan(item, planOutput) {
   ${commentContent}
   \`\`\`
   </details>`;
-            await github_0.pulls.commentInPR(comment, parseInt(prNumber), repo, org);
+            await github_0.pulls.commentInPR(comment, parseInt(prNumber), repo, org, 'logs');
             currentCommentNo += 1;
         }
     }

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

@@ -25,6 +25,7 @@ export declare class GithubCheckRun {
     private readonly includeCheckRunComment;
     private readonly checkRunComment?;
     private hasCommented;
+    private creatingPromise?;
     private closing;
     private closed;
     private buffer;
@@ -58,6 +59,7 @@ export declare class GithubCheckRun {
     private __updateCheckRun;
     private __buildCheckRunUrl;
     private buildOutputTextAndSummary;
+    private __ensureAndUpdateStickyComment;
 }
 /**
  * Factory: build a GithubCheckRun using an installation token for the given org.

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

@@ -1,4 +1,4 @@
-export declare function commentInPR(comment: string, pr_number: number, repo: string, owner?: string): Promise<void>;
+export declare function commentInPR(comment: string, pr_number: number, repo: string, owner?: string, stickyKind?: string): Promise<void>;
 export declare function getPrLastCommitSHA(pull_number: number, repo: string, owner?: string): Promise<string>;
 export declare function getPrMergeCommitSHA(pull_number: number, repo: string, owner?: string): Promise<string>;
 export declare function divideCommentIntoChunks(comment: string, sizeReduction?: number): string[];

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

@@ -0,0 +1,13 @@
+import type { Octokit } from '@octokit/rest';
+export interface UpsertStickyParams {
+    owner: string;
+    repo: string;
+    pullNumber: number;
+    /**
+     * Kind discriminator: one sticky comment per kind
+     * e.g., "plan" | "apply" | "destroy" | "logs" | "check-run:<name>"
+     */
+    kind: string;
+    body: string;
+}
+export declare function upsertStickyComment(octokit: Octokit, params: UpsertStickyParams): Promise<void>;

package/package.json

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