@firestartr/cli 1.53.0-snapshot-11 → 1.53.0-snapshot-13

package/build/index.js

@@ -360725,7 +360725,7 @@ function renderFeature(featureName, version, owner, repo, featureOwner, renderPa
     return features_renderer.render(extractPath, renderedPath, featureOwner, {}, featureArgs);
 }
 /*
- * This functionality does the same of the above
+ * This functionality does the same as the above
  * without downloading and extracting the feature
  */
 function renderFeatureFromPath(extractPath, renderedPath, featureOwner, featureArgs = {}) {
@@ -360907,7 +360907,7 @@ async function utils_renderFeature(featureName, featureVersion, featureOutputObj
 // this is the only way currently to make
 // work the system and inject our code
 // without having to download a feature
-let MOCK_FEATURES_FN = undefined;
+let MOCK_FEATURES_FN;
 function MOCK_FEATURES(mock) {
     MOCK_FEATURES_FN = mock;
     if (mock) {
@@ -364078,9 +364078,10 @@ class FeatureRepoChart extends BaseGithubChart {
                 org: claim.org,
                 repositoryTarget,
                 files: claim.files.map((file) => {
+                    if (file.targetBranch === '')
+                        delete file['targetBranch'];
                     return {
                         ...file,
-                        targetBranch: file.targetBranch ?? undefined,
                     };
                 }),
                 firestartr: {
@@ -364099,7 +364100,8 @@ class FeatureRepoChart extends BaseGithubChart {
             ...annotations,
         };
         // We do this to remove undefined variables from the template
-        return JSON.parse(JSON.stringify(cr, null, 2));
+        const crTemplate = JSON.parse(JSON.stringify(cr, null, 2));
+        return crTemplate;
     }
     gvk() {
         return FirestartrGithubRepositoryFeature.GVK;
@@ -368418,6 +368420,7 @@ function enqueue(pluralKind, workItem, queue, compute, syncCtl, retryCtl) {
     workItem.getItem = () => {
         return getItemByItemPath(informer_itemPath(pluralKind, workItem.item));
     };
+    workItem.isDeadLetter = false;
     workItem.handler = {
         finalize: unsetFinalizer,
         pluralKind,
@@ -368748,12 +368751,39 @@ function formatElapsedTimeWithDate(upsertTime) {
     return `${parts.slice(0, 2).join(', ')} ago`;
 }
 
+;// CONCATENATED MODULE: ../operator/src/processItemDLH.ts
+
+
+
+/*
+ * Dead-Letter Handler
+ *
+ * It manages failed WorkItems with an uncontrolled exception
+ * it always closes the WorkItem and tries to put the CR in an ERROR state
+ */
+async function deadLetterHandler(workItem) {
+    const { operation } = workItem;
+    const itemPath = workItem.handler.itemPath();
+    workItem.workStatus = WorkStatus.FINISHED;
+    workItem.isDeadLetter = true;
+    // we try to put the CR in a correct state
+    try {
+        await updateTransition(itemPath, operation, 'ERROR', 'True', 'Uncontrolled error (DLH)');
+        await updateTransition(itemPath, operation, 'PROVISIONED', 'False', 'Uncontrolled error (DLH)');
+        await updateTransition(itemPath, operation, 'PROVISIONING', 'False', 'Uncontrolled error (DLH)');
+    }
+    catch (err) {
+        operator_src_logger.error(`Error handling WorkItem in DeadLetter state: ${workItem.handler.itemPath()}: ${err}`);
+    }
+}
+
 ;// CONCATENATED MODULE: ../operator/src/processItem.ts
 
 
 
 
 
+
 const queue = [];
 const WEIGHTS = {
     RENAMED: 15,
@@ -368806,6 +368836,7 @@ function getQueueMetrics() {
         nItemsFinished: queue.filter((workItem) => workItem.workStatus === WorkStatus.FINISHED).length,
         nItemsPending: queue.filter((workItem) => workItem.workStatus === WorkStatus.PENDING).length,
         nItemsProcessing: queue.filter((workItem) => workItem.workStatus === WorkStatus.PROCESSING).length,
+        nItemsInDeadLetterHandling: queue.filter((workItem) => workItem.isDeadLetter === true).length,
         nItemsTypes: {
             nothing,
             retry,
@@ -368939,7 +368970,8 @@ async function runWorkItem(workItem) {
             return;
         }
         else {
-            operator_src_logger.error(`An error occurred while the processor was handling the '${workItem.operation}' operation for item '${workItem.item.kind}/${workItem.item.metadata.name}' in namespace '${workItem.item.metadata.namespace}'. Current work status is '${workItem.workStatus}'. The error was: '${e}'.`);
+            operator_src_logger.error(`An unmanaged error occurred while the processor was handling the '${workItem.operation}' operation for item '${workItem.item.kind}/${workItem.item.metadata.name}' in namespace '${workItem.item.metadata.namespace}'. Current work status is '${workItem.workStatus}'. The error was: '${e}'.`);
+            await deadLetterHandler(workItem);
             console.error(e);
         }
         return;
@@ -374229,11 +374261,15 @@ async function startQueueMetrics(meter, attributes) {
     const nWorkItemsPendingCounter = meter.createObservableGauge('firestartr_workitems_pending_total', { description: 'Number of workitems with PENDING status in the queue' });
     const nWorkItemsProcessingCounter = meter.createObservableGauge('firestartr_workitems_processing_total', { description: 'Number of workitems with PROCESSING status in the queue' });
     const nWorkItemsFinishedCounter = meter.createObservableGauge('firestartr_workitems_finished_total', { description: 'Number of workitems with FINISHED status in the queue' });
+    const nWorkItemsInDeadLetterHandling = meter.createObservableGauge('firestartr_workitems_dead_letter_handling_total', {
+        description: 'Number of workitems of the queue handled by the Dead Letter Handler',
+    });
     const queueMetrics = getQueueMetrics();
     let total = queueMetrics.nItems;
     let pending = queueMetrics.nItemsPending;
     let processing = queueMetrics.nItemsProcessing;
     let finished = queueMetrics.nItemsFinished;
+    let inDeadLetterHandling = queueMetrics.nItemsInDeadLetterHandling;
     nWorkItemsCounter.addCallback((observer) => observer.observe(total, { ...attributes, ...queueMetrics.nItemsTypes }));
     nWorkItemsPendingCounter.addCallback((observer) => observer.observe(pending, { ...attributes, ...queueMetrics.nItemsTypes }));
     nWorkItemsProcessingCounter.addCallback((observer) => observer.observe(processing, {
@@ -374241,12 +374277,17 @@ async function startQueueMetrics(meter, attributes) {
         ...queueMetrics.nItemsTypes,
     }));
     nWorkItemsFinishedCounter.addCallback((observer) => observer.observe(finished, { ...attributes, ...queueMetrics.nItemsTypes }));
+    nWorkItemsInDeadLetterHandling.addCallback((observer) => observer.observe(inDeadLetterHandling, {
+        ...attributes,
+        ...queueMetrics.nItemsTypes,
+    }));
     setInterval(() => {
         const queueMetrics = getQueueMetrics();
         total = queueMetrics.nItems;
         pending = queueMetrics.nItemsPending;
         processing = queueMetrics.nItemsProcessing;
         finished = queueMetrics.nItemsFinished;
+        inDeadLetterHandling = queueMetrics.nItemsInDeadLetterHandling;
     }, 1000);
 }
 async function startMemoryMetrics(meter, attributes) {

package/build/packages/operator/src/informer.d.ts

@@ -22,6 +22,7 @@ export type WorkItem = {
     onDelete: Function;
     process?: Function;
     upsertTime?: number;
+    isDeadLetter?: boolean;
 };
 type HandlerFinalizerFn = (kind: string, namespace: string, item: any | string, finalizer: string) => Promise<any>;
 type HandlerInformPlanFn = (prUrl: string, planText: string) => Promise<void>;

package/build/packages/operator/src/processItem.d.ts

@@ -4,6 +4,7 @@ export declare function getQueueMetrics(): {
     nItemsFinished: number;
     nItemsPending: number;
     nItemsProcessing: number;
+    nItemsInDeadLetterHandling: number;
     nItemsTypes: {
         nothing: number;
         retry: number;

package/build/packages/operator/src/processItemDLH.d.ts

@@ -0,0 +1,2 @@
+import { WorkItem } from './informer';
+export declare function deadLetterHandler(workItem: WorkItem): Promise<void>;

package/package.json

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