@firestartr/cli 1.58.0 → 1.59.0-snapshot-2

package/build/index.js

@@ -367567,12 +367567,40 @@ function definitions_getPluralFromKind(kind) {
     return plural;
 }
 
+;// CONCATENATED MODULE: ../operator/src/pr-annotation.ts
+
+
+const LAST_STATE_PR_ANNOTATION = 'firestartr.dev/last-state-pr';
+function getPrInfoFromAnnotation(item, annotation = LAST_STATE_PR_ANNOTATION) {
+    const itemId = `${item?.kind ?? 'UnknownKind'}/${item?.metadata?.name ?? 'unknown'}`;
+    const annotationValue = item?.metadata?.annotations?.[annotation];
+    if (typeof annotationValue !== 'string' ||
+        annotationValue.trim().length === 0) {
+        operator_src_logger.warn(`CR ${itemId} is missing annotation "${annotation}"; skipping GitHub feedback.`);
+        return null;
+    }
+    try {
+        const { owner, repo, prNumber } = catalog_common.generic.getOwnerRepoPrNumberFromAnnotationValue(annotationValue);
+        return {
+            annotationValue,
+            owner,
+            repo,
+            prNumber,
+        };
+    }
+    catch (e) {
+        operator_src_logger.warn(`CR ${itemId} has invalid annotation "${annotation}" with value '${annotationValue}'; skipping GitHub feedback. Error: '${e?.message ?? String(e)}'.`);
+        return null;
+    }
+}
+
 ;// CONCATENATED MODULE: ../operator/src/ctl.ts
 
 
 
 
 
+
 const MAX_CHARS_OUPUT_PLAN = 20000;
 
 async function getItem(kind, namespace, item) {
@@ -367977,8 +368005,10 @@ async function addApplyCommitStatus(cr, state, targetURL = '', description = '',
 }
 async function addDestroyCommitStatus(cr, state, description = '', context = '') {
     try {
-        const prUrl = await getLastStatePrInfo(cr);
-        await addCommitStatusToPrMergeCommit(prUrl, state, '', description, context);
+        const prInfo = getPrInfoFromAnnotation(cr, LAST_STATE_PR_ANNOTATION);
+        if (!prInfo)
+            return;
+        await addCommitStatusToPrMergeCommit(prInfo.annotationValue, state, '', description, context);
     }
     catch (e) {
         operator_src_logger.error(`The ctl encountered an error while adding the destroy commit status for custom resource '${cr.metadata.name}' in namespace '${cr.metadata.namespace}'. State: '${state}'. Description: '${description}'. Error: '${e}'.`);
@@ -368026,33 +368056,6 @@ async function addCommitStatusToPrMergeCommit(prAnnotationValue, state, targetUR
     operator_src_logger.info(`The ctl is adding a commit status for '${owner}/${repo}' on branch '${branchSha}'. State: '${state}'. Target URL: '${targetURL}'.`);
     await github_0.repo.addCommitStatus(state, branchSha, repo, owner, targetURL, description, context);
 }
-async function getLastStatePrInfo(cr) {
-    try {
-        const annKey = 'firestartr.dev/last-state-pr';
-        const prInfo = cr?.metadata?.annotations?.[annKey];
-        if (!prInfo || typeof prInfo !== 'string')
-            return '';
-        // Expect "owner/repo#<num>" or "owner/repo"
-        const [orgRepo] = prInfo.split('#');
-        const [owner, repo] = (orgRepo || '').split('/');
-        if (!owner || !repo)
-            return '';
-        const prData = await github_0.pulls.filterPrBy({
-            title: `hydrate: ${cr?.metadata?.name ?? ''}`,
-            state: 'closed',
-            repo,
-            owner,
-            userType: 'Bot',
-        }, { maxRetries: 3 });
-        const prNumber = prData?.number;
-        if (typeof prNumber !== 'number')
-            return '';
-        return `${owner}/${repo}#${prNumber}`;
-    }
-    catch {
-        return '';
-    }
-}
 async function createDryRun(manifest, namespace) {
     const { kc } = await ctl_getConnection();
     const k8sApi = kc.makeApiClient(client_node_dist.CustomObjectsApi);
@@ -372078,7 +372081,7 @@ 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, isSuccess = true, exitCode) {
     const kind = item.kind;
     const metadataName = item.metadata?.name ?? 'unknown';
@@ -372100,23 +372103,12 @@ async function tryPublishApply(item, planOutput, isSuccess = true, exitCode) {
 }
 async function tryPublishDestroy(item, destroyOutput, isSuccess = true) {
     const kind = item.kind;
-    let lastPr = null;
     try {
-        const { repo, org } = extractPrInfo(item);
-        operator_src_logger.debug(`The user feedback for the '${item.kind}/${item.metadata.name}' destroy operation is being published for repository '${repo}' in organization '${org}'.`);
-        lastPr = await github_0.pulls.filterPrBy({
-            title: `hydrate: ${item.metadata.name}`,
-            state: 'closed',
-            repo,
-            owner: org,
-            userType: 'Bot',
-        }, {
-            maxRetries: 3,
-        });
-        if (!lastPr) {
-            operator_src_logger.debug(`The user feedback for the '${item.kind}/${item.metadata.name}' destroy operation could not be published because the last state was not found.`);
+        const prInfo = getPrInfoFromAnnotation(item, LAST_STATE_PR_ANNOTATION);
+        if (!prInfo)
             return;
-        }
+        const { repo, owner: org, prNumber } = prInfo;
+        operator_src_logger.debug(`The user feedback for the '${item.kind}/${item.metadata.name}' destroy operation is being published for repository '${repo}' in organization '${org}' on PR '${prNumber}'.`);
         const dividedOutput = github_0.pulls.divideCommentIntoChunks(destroyOutput, 250);
         const statusEmoji = isSuccess ? '✅' : '❌';
         const statusText = isSuccess ? 'Succeeded' : 'Failed';
@@ -372136,17 +372128,17 @@ ${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}'.`);
+        operator_src_logger.debug(`The user feedback for item '${item.kind}/${item.metadata.name}' is being published as a comment on pull request '${prNumber}' for repository '${repo}' in organization '${org}'.`);
         // Get octokit instance for the org to use with upsertMultiPartStickyComments
         const octokit = await github_0.auth.getOctokitForOrg(org);
         await github_0.feedback.upsertMultiPartStickyComments(octokit, {
             owner: org,
             repo,
-            pullNumber: lastPr.number,
+            pullNumber: prNumber,
             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 '${lastPr.number}'.`);
+        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}'.`);
     }
     catch (e) {
         operator_src_logger.error(`An error occurred while publishing user feedback for item '${item.kind}/${item.metadata.name}': '${e}'.`);
@@ -376637,7 +376629,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = {"i8":"1.58.0"};
+const package_namespaceObject = JSON.parse('{"i8":"1.59.0-snapshot-2"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"1.58.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

package/build/packages/operator/src/pr-annotation.d.ts

@@ -0,0 +1,8 @@
+export declare const LAST_STATE_PR_ANNOTATION = "firestartr.dev/last-state-pr";
+export type PrAnnotationInfo = {
+    annotationValue: string;
+    owner: string;
+    repo: string;
+    prNumber: number;
+};
+export declare function getPrInfoFromAnnotation(item: any, annotation?: string): PrAnnotationInfo | null;

package/package.json

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