@firestartr/cli 2.7.0-snapshot-3 → 2.7.0-snapshot-5

package/build/index.js

@@ -280379,7 +280379,6 @@ TechnologyInitializer.applicableKinds = ['ComponentClaim'];
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/initializers/backstage.ts
 
-
 class BackstageInitializer extends InitializerPatches {
     constructor() {
         super(...arguments);
@@ -280395,6 +280394,7 @@ class BackstageInitializer extends InitializerPatches {
                     return true;
                 },
                 apply(cr) {
+                    // set annotation
                     cr.metadata.annotations = cr.metadata.annotations ?? {};
                     cr.metadata.annotations['backstage.io/kubernetes-id'] = claim.name;
                     return cr;
@@ -280413,35 +280413,10 @@ class BackstageInitializer extends InitializerPatches {
                     return true;
                 },
                 apply(cr) {
-                    cr.metadata.annotations = cr.metadata.annotations ?? {};
-                    cr.metadata.annotations['backstage.io/kubernetes-label-selector'] =
-                        catalog_common/* default.generic.normalizeLabel */.Z.generic.normalizeLabel(`backstage.io-kubernetes-id-${claim.name}`);
-                    return cr;
-                },
-                identify() {
-                    return 'initializers/BackstageInitializer';
-                },
-                applicable() {
-                    return {
-                        applicableProviders: ['catalog'],
-                    };
-                },
-            },
-            {
-                validate() {
-                    return true;
-                },
-                apply(cr) {
-                    const org = claim.providers?.github?.org;
-                    const repoName = claim.providers?.github?.name;
-                    if (!org || !repoName)
-                        return cr;
-                    cr.metadata.annotations = cr.metadata.annotations ?? {};
-                    if (cr.metadata.annotations['github.com/project-slug'] !== undefined) {
-                        return cr;
-                    }
-                    cr.metadata.annotations['github.com/project-slug'] =
-                        `${org}/${repoName}`;
+                    // set label
+                    cr.metadata.labels = cr.metadata.labels ?? {};
+                    cr.metadata.labels['backstage.io/kubernetes-label-selector'] =
+                        `backstage.io/kubernetes-id=${claim.name}`;
                     return cr;
                 },
                 identify() {
@@ -280456,8 +280431,6 @@ class BackstageInitializer extends InitializerPatches {
         ];
     }
 }
-BackstageInitializer.applicableKinds = ['ComponentClaim'];
-
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/initializers/syncer.ts
 
@@ -293135,17 +293108,46 @@ async function updateSyncTransition(itemPath, reason, lastSyncTime, nextSyncTime
 }
 async function updateRetryStatusInCR(pluralKind, namespace, name, retryCount, nextRetryTime) {
     const itemPath = `${namespace}/${pluralKind}/${name}`;
-    const item = await getItemByItemPath(itemPath);
-    if (!('status' in item) || item.status === null)
-        item.status = {};
-    item.status.retryCount = retryCount;
-    if (nextRetryTime) {
-        item.status.nextRetryTime = nextRetryTime;
+    try {
+        const item = await getItemByItemPath(itemPath);
+        if (!('status' in item) || item.status === null)
+            item.status = {};
+        item.status.retryCount = retryCount;
+        if (nextRetryTime) {
+            item.status.nextRetryTime = nextRetryTime;
+        }
+        else {
+            delete item.status.nextRetryTime;
+        }
+        await writePrioritizedStatus(pluralKind, namespace, item);
     }
-    else {
-        delete item.status.nextRetryTime;
+    catch (e) {
+        if (isKubernetesNotFoundError(e)) {
+            operator_src_logger.info(`Skipping retry status update for '${itemPath}' because the custom resource was not found.`);
+            return;
+        }
+        throw e;
     }
-    await writePrioritizedStatus(pluralKind, namespace, item);
+}
+function isKubernetesNotFoundError(error) {
+    if (typeof error === 'string') {
+        return isNotFoundMessage(error);
+    }
+    if (!error || typeof error !== 'object') {
+        return false;
+    }
+    const k8sError = error;
+    return (k8sError.code === 404 ||
+        k8sError.status === 404 ||
+        k8sError.statusCode === 404 ||
+        k8sError.response?.status === 404 ||
+        k8sError.response?.statusCode === 404 ||
+        k8sError.body?.code === 404 ||
+        k8sError.body?.reason === 'NotFound' ||
+        isNotFoundMessage(k8sError.message));
+}
+function isNotFoundMessage(message) {
+    return typeof message === 'string' && /\bnot\s*found\b/i.test(message);
 }
 async function writePrioritizedStatus(kind, namespace, item) {
     setHighPriorityStatus(item);
@@ -303556,7 +303558,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.7.0-snapshot-3"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.7.0-snapshot-5"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.6.1"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

package/build/packages/cdk8s_renderer/src/initializers/backstage.d.ts

@@ -1,7 +1,6 @@
 import { InitializerPatches } from './base';
 export declare class BackstageInitializer extends InitializerPatches {
     applicableProviders: string[];
-    static applicableKinds: string[];
     __validate(): Promise<boolean>;
     __patches(claim: any, _: any): Promise<{
         validate(): boolean;

package/package.json

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