@firestartr/cli 1.53.0-snapshot-1 → 1.53.0-snapshot-3

package/build/index.js

@@ -354119,6 +354119,7 @@ async function getUserInfo(name) {
 });
 
 ;// CONCATENATED MODULE: ../github/src/sticky_comment.ts
+
 const locks = new Map();
 async function withLock(key, fn) {
     const prev = locks.get(key) ?? Promise.resolve();
@@ -354152,6 +354153,7 @@ 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));
+    github_src_logger.info(`readStickyIdFromPrBody: owner=${owner} repo=${repo} pr=${pr} kind=${kind} => id=${m ? m[1] : 'undefined'}`);
     return m ? Number(m[1]) : undefined;
 }
 async function writeStickyIdToPrBody(octokit, owner, repo, pr, kind, id) {
@@ -354159,6 +354161,7 @@ async function writeStickyIdToPrBody(octokit, owner, repo, pr, kind, id) {
     const body = get.data?.body ?? '';
     const rx = prIdRegex(kind);
     const marker = prIdMarker(kind, id);
+    github_src_logger.info(`writeStickyIdToPrBody: owner=${owner} repo=${repo} pr=${pr} kind=${kind} id=${id}`);
     const next = rx.test(body)
         ? body.replace(rx, marker)
         : body
@@ -354181,6 +354184,7 @@ async function upsertStickyComment(octokit, params) {
         // 1) PR-body registry fast path
         const idFromPr = await readStickyIdFromPrBody(octokit, owner, repo, pullNumber, kind);
         if (idFromPr) {
+            github_src_logger.info(`upsertStickyComment: found existing comment ID ${idFromPr} from PR body for kind=${kind}`);
             await octokit.rest.issues.updateComment({
                 owner,
                 repo,
@@ -354189,7 +354193,7 @@ async function upsertStickyComment(octokit, params) {
             });
             return;
         }
-        // 2) Try to find an existing comment by kind marker
+        // 2) Try to find existing comments by kind marker
         try {
             const all = await octokit.paginate(octokit.rest.issues.listComments, {
                 owner,
@@ -354198,20 +354202,42 @@ async function upsertStickyComment(octokit, params) {
                 per_page: 100,
             });
             const marker = bodyMarker(kind);
-            const hit = all.find((c) => typeof c.body === 'string' && c.body.includes(marker));
-            if (hit?.id) {
+            const matches = all.filter((c) => typeof c.body === 'string' && c.body.includes(marker));
+            if (matches.length > 0) {
+                // Sort by created_at to identify the oldest comment
+                const sorted = matches.sort((a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime());
+                const primaryComment = sorted[0];
+                // Update the primary (oldest) comment
+                github_src_logger.info(`upsertStickyComment: found existing comment ID ${primaryComment.id} by marker for kind=${kind}, updating it and deleting ${sorted.length - 1} duplicates`);
                 await octokit.rest.issues.updateComment({
                     owner,
                     repo,
-                    comment_id: hit.id,
+                    comment_id: primaryComment.id,
                     body: fullBody,
                 });
-                await writeStickyIdToPrBody(octokit, owner, repo, pullNumber, kind, hit.id);
+                // Store its ID in PR body
+                await writeStickyIdToPrBody(octokit, owner, repo, pullNumber, kind, primaryComment.id);
+                // Delete all duplicate comments (from index 1 onwards)
+                for (let i = 1; i < sorted.length; i++) {
+                    github_src_logger.info(`upsertStickyComment: deleting duplicate comment ID ${sorted[i].id} for kind=${kind}`);
+                    try {
+                        await octokit.rest.issues.deleteComment({
+                            owner,
+                            repo,
+                            comment_id: sorted[i].id,
+                        });
+                    }
+                    catch (deleteErr) {
+                        // Log but continue deleting others
+                        github_src_logger.warn(`Failed to delete duplicate comment ${sorted[i].id} for ${kind}: ${deleteErr}`);
+                    }
+                }
                 return;
             }
         }
-        catch {
+        catch (err) {
             // if paginate/listComments not available, we'll fall back to creating
+            github_src_logger.warn(`Failed to list comments for kind=${kind} on PR #${pullNumber}: ${err}`);
         }
         // 3) Create new comment and register
         const created = await octokit.rest.issues.createComment({
@@ -357701,6 +357727,7 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                         },
                         owner: {
                             type: 'string',
+                            pattern: '^(user|group):[a-zA-Z0-9_-]+$',
                         },
                     },
                     required: ['description', 'owner'],
@@ -359463,6 +359490,9 @@ var ajv_default = /*#__PURE__*/__nccwpck_require__.n(dist_ajv);
                 upgradable: {
                     type: 'boolean',
                 },
+                target_branch: {
+                    type: 'string',
+                },
             },
             required: ['dest', 'src'],
             title: 'File',
@@ -360367,6 +360397,7 @@ function render(featurePath, featureRenderPath, entity, firestartrConfig = {}, f
         // For now let's keep upgradeable flag for backward compatibility
         // by default it's false
         const userManaged = file.user_managed ?? file.upgradeable ?? false;
+        const targetBranch = file.target_branch ?? '';
         features_renderer_src_logger.debug(`Rendering ${src} to ${dest}`);
         // render the content of the file
         const content = addTraceability(context, src, renderContent(external_fs_default().readFileSync(external_path_default().join(featurePath, 'templates', src)).toString(), context));
@@ -360379,6 +360410,7 @@ function render(featurePath, featureRenderPath, entity, firestartrConfig = {}, f
             localPath: destFilePath,
             repoPath: dest,
             userManaged: userManaged,
+            targetBranch,
         });
         output.patches = context.config.patches;
         // Not used anymore
@@ -362542,6 +362574,7 @@ function toJson_FirestartrGithubRepositoryFeatureSpecFiles(obj) {
         'path': obj.path,
         'userManaged': obj.userManaged,
         'content': obj.content,
+        'targetBranch': obj.targetBranch,
     };
     // filter undefined values
     return Object.entries(result).reduce((r, i) => (i[1] === undefined) ? r : ({ ...r, [i[0]]: i[1] }), {});
@@ -363987,7 +364020,12 @@ class FeatureRepoChart extends BaseGithubChart {
                 version: claim.feature.version,
                 org: claim.org,
                 repositoryTarget,
-                files: claim.files,
+                files: claim.files.map((file) => {
+                    return {
+                        ...file,
+                        targetBranch: file.targetBranch,
+                    };
+                }),
                 firestartr: {
                     tfStateKey: claim.firestartr.tfStateKey,
                 },
@@ -364219,10 +364257,10 @@ class GithubRepositoryChart extends BaseGithubChart {
         this.set('features', features);
     }
     async postRenderSecretsSection(cr) {
-        const areThereSecrets = this.get('claim').providers?.github?.secrets ?? false;
-        if (!areThereSecrets) {
-            return;
-        }
+        // we always render the secretsSection
+        // even if it is empty because we don't have a proper
+        // way to know if there were secrets and now they have been
+        // erased
         const secretsSectionChart = await (await new RepoSecretsSectionChart(this, 'secrets-section', cr.spec.firestartr.tfStateKey, this.get('claim'), [], cr).render()).postRenderer([]);
         this.set('secrets_section', {
             claim: {
@@ -367328,7 +367366,7 @@ async function writePlanInGithubPR(prUrl, planText) {
     ${planText}
     \`\`\`
     `;
-        await github_0.pulls.commentInPR(message, +pr_number, repo, owner, 'logs');
+        await github_0.pulls.commentInPR(message, +pr_number, repo, owner, 'terraform:plan');
     }
     catch (err) {
         operator_src_logger.error(`writePlanInGithubPR: Cannot write plan in PR: ${err}`);
@@ -369329,13 +369367,16 @@ function provisionFeatureFiles(scope, feature) {
     provisioner_src_logger.info(`Provisioning feature ${feature.spec.type} for ${feature.spec.repositoryTarget.name}`);
     provisioner_src_logger.debug('Feature output json: %O', feature);
     if (feature.spec.files) {
+        const defaultBranchName = feature.spec.repositoryTarget.branch;
         for (const file of feature.spec.files) {
             provisioner_src_logger.debug('Provisioning file %O', file);
             const lifecycleArg = file.userManaged
                 ? { ignoreChanges: ['content'] }
                 : {};
             const repoConfig = {
-                branch: feature.spec.repositoryTarget.branch,
+                branch: file.targetBranch.length === 0
+                    ? defaultBranchName
+                    : file.targetBranch,
                 commitMessage: `feat: ${feature.spec.type} ${feature.spec.version}`,
                 content: cdktf_lib.Fn.base64decode(file.content),
                 file: file.path,
@@ -370819,9 +370860,10 @@ if (process.env.RUN_PROVISIONER) {
 ;// CONCATENATED MODULE: ../operator/src/user-feedback-ops/user-feedback-ops.ts
 
 
+const LAST_STATE_PR_ANNOTATION = 'firestartr.dev/last-state-pr';
 async function tryPublishApply(item, planOutput, kind) {
     try {
-        if (!('firestartr.dev/last-state-pr' in item.metadata.annotations)) {
+        if (!(LAST_STATE_PR_ANNOTATION in item.metadata.annotations)) {
             operator_src_logger.debug(`The user feedback for the '${kind}/${item.metadata.name}' apply operation could not be published because the last state was not found.`);
             return;
         }
@@ -370865,7 +370907,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, 'logs');
+            await github_0.pulls.commentInPR(comment, lastPr.number, repo, org, 'tfworkspace:destroy');
             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;
         }
@@ -370891,7 +370933,7 @@ async function publishApply(item, applyOutput, kind) {
 ${commentContent}
 \`\`\`
 </details>`;
-        await github_0.pulls.commentInPR(comment, parseInt(prNumber), repo, org, 'logs');
+        await github_0.pulls.commentInPR(comment, prNumber, repo, org, 'apply');
         currentCommentNo += 1;
     }
 }
@@ -370912,8 +370954,10 @@ function tryCreateErrorSummary(title, errorMsg) {
         return `Error when getting error summary: ${e}`;
     }
 }
-function extractPrInfo(item) {
-    const prInfo = item.metadata.annotations['firestartr.dev/last-state-pr'];
+function extractPrInfo(item, annotation = LAST_STATE_PR_ANNOTATION) {
+    const prInfo = item.metadata.annotations[annotation];
+    if (!prInfo)
+        throw new Error(`No ${annotation} annotation found in CR`);
     const prNumber = prInfo.split('#')[1];
     if (!prNumber)
         throw new Error('No PR number found in CR');
@@ -370923,7 +370967,11 @@ function extractPrInfo(item) {
     const repo = prInfo.split('#')[0].split('/')[1];
     if (!repo)
         throw new Error('No repo found in CR');
-    return { prNumber, repo, org };
+    const prNumberInt = parseInt(prNumber, 10);
+    if (isNaN(prNumberInt)) {
+        throw new Error(`Invalid PR number found in CR: '${prNumber}'`);
+    }
+    return { prNumber: prNumberInt, repo, org };
 }
 async function tryPublishError(item, reason, message) {
     try {
@@ -370940,7 +370988,7 @@ async function publishError(item, reason, message) {
 #### ℹ️ Details:
 ${message}
 `;
-    await github_0.pulls.commentInPR(comment, parseInt(prNumber), repo, org, 'logs');
+    await github_0.pulls.commentInPR(comment, prNumber, repo, org, 'logs');
 }
 async function publishPlan(item, planOutput, prNumber, repo, org) {
     try {
@@ -370959,7 +371007,7 @@ async function publishPlan(item, planOutput, prNumber, repo, org) {
 ${commentContent}
 \`\`\`
 </details>`;
-            await github_0.pulls.commentInPR(comment, prNumber, repo, org, 'logs');
+            await github_0.pulls.commentInPR(comment, prNumber, repo, org, 'tfworkspace:plan');
             currentCommentNo += 1;
         }
     }
@@ -370970,8 +371018,9 @@ ${commentContent}
 
 ;// CONCATENATED MODULE: ../operator/src/user-feedback-ops/gh-checkrun.ts
 
+
 async function GHCheckRun(cmd, item) {
-    const prInfo = gh_checkrun_extractPrInfo(item);
+    const prInfo = extractPrInfo(item);
     if (!prInfo.prNumber) {
         throw new Error('TFCheckRun: prNumber not retrievable');
     }
@@ -371000,20 +371049,6 @@ async function GHCheckRun(cmd, item) {
 function helperCreateCheckRunName(cmd, item) {
     return `${item.kind} - ${cmd}`;
 }
-function gh_checkrun_extractPrInfo(item) {
-    const prInfo = item.metadata.annotations['firestartr.dev/last-state-pr'];
-    const prNumber = prInfo.split('#')[1];
-    if (!prNumber)
-        throw new Error('No PR number found in CR');
-    const orgRepo = prInfo.split('#')[0];
-    const org = orgRepo.split('/')[0];
-    if (!org)
-        throw new Error('No org found in CR');
-    const repo = orgRepo.split('/')[1];
-    if (!repo)
-        throw new Error('No repo found in CR');
-    return { prNumber, repo, org };
-}
 
 ;// CONCATENATED MODULE: ../operator/cdktf.ts
 
@@ -372314,9 +372349,10 @@ async function* errorPolicyCompatibility(syncPolicy, generalPolicy, item, op) {
 ;// CONCATENATED MODULE: ../operator/src/user-feedback-ops/tf-checkrun.ts
 
 
+
 async function TFCheckRun(cmd, item) {
     try {
-        const prInfo = tf_checkrun_extractPrInfo(item);
+        const prInfo = extractPrInfo(item);
         const checkRun = await github_0.feedback.createCheckRun(prInfo.org, prInfo.repo, tf_checkrun_helperCreateCheckRunName(cmd), {
             pullNumber: Number(prInfo.prNumber),
             includeCheckRunComment: true,
@@ -372333,7 +372369,7 @@ async function TFCheckRun(cmd, item) {
             fnEnd: () => {
                 checkRun.close('OK', true);
             },
-            fnOnError: (err) => {
+            fnOnError: (_) => {
                 checkRun.close('KO', false);
             },
         };
@@ -372342,30 +372378,15 @@ async function TFCheckRun(cmd, item) {
         // log error and return empty fns
         logger_logger.warn('Error in TFCheckRun:', e);
         return {
-            fnData: (d) => { },
+            fnData: (_) => { },
             fnEnd: () => { },
-            fnOnError: (err) => { },
+            fnOnError: (_) => { },
         };
     }
 }
 function tf_checkrun_helperCreateCheckRunName(cmd) {
     return `TFWorkspace - ${cmd}`;
 }
-function tf_checkrun_extractPrInfo(item) {
-    const prInfo = item.metadata.annotations['firestartr.dev/last-state-pr'];
-    if (!prInfo)
-        throw new Error('No firestartr.dev/last-state-pr field in CR');
-    const prNumber = prInfo.split('#')[1];
-    if (!prNumber)
-        throw new Error('No PR number found in CR');
-    const org = prInfo.split('#')[0].split('/')[0];
-    if (!org)
-        throw new Error('No org found in CR');
-    const repo = prInfo.split('#')[0].split('/')[1];
-    if (!repo)
-        throw new Error('No repo found in CR');
-    return { prNumber, repo, org };
-}
 
 ;// CONCATENATED MODULE: ../operator/src/utils/index.ts
 const secretRegex = /\$\{\{ secrets\.(.*?) \}\}/g;
@@ -373235,7 +373256,6 @@ async function acquireLease(namespace, cb, interval = 10000) {
 
 
 
-
 const processOperationPlan_TF_PROJECTS_PATH = '/tmp/tfworkspaces';
 function processOperationPlan(item, op, handler) {
     try {
@@ -373311,7 +373331,8 @@ async function* doPlanPlainTextFormat(item, op, handler, action) {
             await addPlanStatusCheck(item.metadata.annotations['firestartr.dev/last-state-pr'], 'Terraform plan in progress...');
         }
         const tfPlanOutput = await runTerraformProvisioner(context, action);
-        await processOperationPlan_publishPlan(item, tfPlanOutput);
+        const { prNumber, repo, org } = extractPrInfo(item, 'firestartr.dev/pull-request-plan');
+        await publishPlan(item, tfPlanOutput, prNumber, repo, org);
         yield {
             item,
             reason: op,
@@ -373338,7 +373359,8 @@ async function* doPlanPlainTextFormat(item, op, handler, action) {
         }
     }
     catch (e) {
-        await processOperationPlan_publishPlan(item, JSON.stringify(e));
+        const { prNumber, repo, org } = extractPrInfo(item, 'firestartr.dev/pull-request-plan');
+        await publishPlan(item, JSON.stringify(e), prNumber, repo, org);
         operator_src_logger.error('TFWORKSPACE_PROCESSOR_PLAN_OBSERVING_ERROR', {
             metadata: { item, error: e },
         });
@@ -373653,7 +373675,6 @@ function processOperationPlan_clearLocalTfProjects() {
     external_fs_.rmSync(processOperationPlan_TF_PROJECTS_PATH, { recursive: true, force: true });
 }
 function processOperationPlan_getErrorOutputMessage(cr, key, ref) {
-    const result = '';
     if (cr.spec.source === 'Remote') {
         return `
 
@@ -373686,43 +373707,6 @@ function processOperationPlan_getErrorOutputMessage(cr, key, ref) {
         throw new Error(`❌ Source ${cr.spec.source} not supported`);
     }
 }
-async function processOperationPlan_publishPlan(item, planOutput) {
-    try {
-        const prInfo = item.metadata.annotations['firestartr.dev/pull-request-plan'];
-        if (!prInfo)
-            throw new Error('No PR info found in CR');
-        const prNumber = prInfo.split('#')[1];
-        if (!prNumber)
-            throw new Error('No PR number found in CR');
-        const org = prInfo.split('#')[0].split('/')[0];
-        if (!org)
-            throw new Error('No org found in CR');
-        const repo = prInfo.split('#')[0].split('/')[1];
-        if (!repo)
-            throw new Error('No repo found in CR');
-        const dividedOutput = github_0.pulls.divideCommentIntoChunks(planOutput, 250);
-        let currentCommentNo = 1;
-        for (const commentContent of dividedOutput) {
-            const comment = `<h1>
-  <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>
-
-  <details id=github>
-  <summary>PLAN LOGS ${dividedOutput.length > 1 ? '(Part ' + currentCommentNo + ')' : ''}</summary>
-
-  \`\`\`shell
-  ${commentContent}
-  \`\`\`
-  </details>`;
-            await github_0.pulls.commentInPR(comment, parseInt(prNumber), repo, org, 'logs');
-            currentCommentNo += 1;
-        }
-    }
-    catch (e) {
-        console.error(e);
-    }
-}
 function processOperationPlan_getPolicy(item) {
     const policy = item.metadata.annotations &&
         item.metadata.annotations['firestartr.dev/policy'];

package/build/packages/cdk8s_renderer/imports/firestartr.dev.d.ts

@@ -1581,6 +1581,10 @@ export interface FirestartrGithubRepositoryFeatureSpecFiles {
      * @schema FirestartrGithubRepositoryFeatureSpecFiles#content
      */
     readonly content: string;
+    /**
+     * @schema FirestartrGithubRepositoryFeatureSpecFiles#targetBranch
+     */
+    readonly targetBranch?: string;
 }
 /**
  * Converts an object of type 'FirestartrGithubRepositoryFeatureSpecFiles' to JSON representation.

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

@@ -20,6 +20,7 @@ declare const _default: {
                     };
                     owner: {
                         type: string;
+                        pattern: string;
                     };
                 };
                 required: string[];

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

@@ -276,6 +276,7 @@ declare const schemas: {
                         };
                         owner: {
                             type: string;
+                            pattern: string;
                         };
                     };
                     required: string[];

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

@@ -27,5 +27,6 @@ interface IGithubRepositoryFeatureFileClaim {
     path: string;
     userManaged: boolean;
     content: string;
+    targetBranch: string;
 }
 export {};

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

@@ -77,6 +77,9 @@ declare const _default: {
                 upgradable: {
                     type: string;
                 };
+                target_branch: {
+                    type: string;
+                };
             };
             required: string[];
             title: string;

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

@@ -1,5 +1,5 @@
 export declare function TFCheckRun(cmd: string, item: any): Promise<{
     fnData: (d: any) => void;
     fnEnd: () => void;
-    fnOnError: (err: any) => void;
+    fnOnError: (_: any) => void;
 }>;

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

@@ -2,6 +2,11 @@ export declare function tryPublishApply(item: any, planOutput: string, kind: str
 export declare function tryPublishDestroy(item: any, destroyOutput: string): Promise<void>;
 export declare function publishApply(item: any, applyOutput: string, kind: string): Promise<void>;
 export declare function tryCreateErrorSummary(title: string, errorMsg: string): string;
+export declare function extractPrInfo(item: any, annotation?: 'firestartr.dev/last-state-pr' | 'firestartr.dev/pull-request-plan'): {
+    prNumber: number;
+    repo: string;
+    org: string;
+};
 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): Promise<void>;

package/package.json

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