@firestartr/cli 2.0.0 → 2.1.0-snapshot-1

package/build/index.js

@@ -367438,12 +367438,12 @@ class RepoGithubDecanter extends GithubDecanter {
             });
         }
         const directWriters = this.data.teamsAndMembers.directMembers
-            .filter((member) => member.role === 'push')
+            .filter((member) => member.role === 'write')
             .map((member) => {
             return `user-imported-ref:${member.name}`;
         });
         const outsideWriters = this.data.teamsAndMembers.outsideMembers
-            .filter((member) => member.role === 'push')
+            .filter((member) => member.role === 'write')
             .map((member) => {
             return `collaborator:${member.name.toLowerCase()}`;
         });
@@ -367462,12 +367462,12 @@ class RepoGithubDecanter extends GithubDecanter {
             });
         }
         const directReaders = this.data.teamsAndMembers.directMembers
-            .filter((member) => member.role === 'pull')
+            .filter((member) => member.role === 'read')
             .map((member) => {
             return `user-imported-ref:${member.name}`;
         });
         const outsideReaders = this.data.teamsAndMembers.outsideMembers
-            .filter((member) => member.role === 'pull')
+            .filter((member) => member.role === 'read')
             .map((member) => {
             return `collaborator:${member.name.toLowerCase()}`;
         });
@@ -367502,7 +367502,11 @@ class RepoGithubDecanter extends GithubDecanter {
             };
         });
         this.data['teamsAndMembers']['teams'] = teams;
-        this.data['teamsAndMembers']['directMembers'] = directMembers;
+        // GitHub's `affiliation=direct` includes outside collaborators, so we must
+        // exclude them from directMembers to avoid tagging them as user-imported-ref.
+        const outsideMemberNames = new Set(outsideMembers.map((m) => m.name.toLowerCase()));
+        const filteredDirectMembers = directMembers.filter((m) => !outsideMemberNames.has(m.name.toLowerCase()));
+        this.data['teamsAndMembers']['directMembers'] = filteredDirectMembers;
         this.data['teamsAndMembers']['outsideMembers'] = outsideMembers;
     }
     async __gatherPages() {
@@ -367906,6 +367910,7 @@ async function reimportGithubGitopsRepository(org, crsPath, configPath, generate
     const collection = new ReimportCollection();
     const importAnnotation = catalog_common.generic.getFirestartrAnnotation('import');
     const reImportAnnotation = catalog_common.generic.getFirestartrAnnotation('needs-re-import');
+    const reconcileAtAnnotation = catalog_common.generic.getFirestartrAnnotation('reconcile-at');
     const crsWithDependenciesToAnnotate = [];
     // we need to perform a search in all the crsPath
     await searchCRs(crsPath, async (cr, filePath) => {
@@ -367922,6 +367927,10 @@ async function reimportGithubGitopsRepository(org, crsPath, configPath, generate
             }
             cr.metadata.annotations[reImportAnnotation] = 'true';
             cr.metadata.annotations[importAnnotation] = 'true';
+            // we set an annotation to trigger the update
+            cr.metadata.annotations[reconcileAtAnnotation] = new Date()
+                .toISOString()
+                .replace(/\.\d{3}Z$/, 'Z'); // exact format: 2026-04-19T20:45:00Z
             // we write the cr back to the file system
             const newContent = catalog_common.io.toYaml(cr);
             await promises_default().writeFile(filePath, newContent, 'utf-8');
@@ -367930,10 +367939,10 @@ async function reimportGithubGitopsRepository(org, crsPath, configPath, generate
     // we need to search for dependencies if proceeds
     if (!collection.IS_SKIP_SET(generatedFilters, 'gh-repo')) {
         importer_src_logger.info(`Searching for dependencies to annotate with ${reImportAnnotation} and ${importAnnotation}`);
-        await searchForDependencies(org, crsPath, configPath, generatedFilters, crsWithDependenciesToAnnotate, reImportAnnotation, importAnnotation);
+        await searchForDependencies(org, crsPath, configPath, generatedFilters, crsWithDependenciesToAnnotate, reImportAnnotation, importAnnotation, reconcileAtAnnotation);
     }
 }
-async function searchForDependencies(org, crsPath, configPath, generatedFilters, crsWithDependenciesToAnnotate, reImportAnnotation, importAnnotation) {
+async function searchForDependencies(org, crsPath, configPath, generatedFilters, crsWithDependenciesToAnnotate, reImportAnnotation, importAnnotation, reconcileAtAnnotation) {
     // we need to perform a search in all the crsPath
     await searchCRs(crsPath, async (cr, filePath) => {
         importer_src_logger.debug(`${JSON.stringify(cr)}`);
@@ -367951,6 +367960,10 @@ async function searchForDependencies(org, crsPath, configPath, generatedFilters,
                     }
                     cr.metadata.annotations[reImportAnnotation] = 'true';
                     cr.metadata.annotations[importAnnotation] = 'true';
+                    // we set an annotation to trigger the update
+                    cr.metadata.annotations[reconcileAtAnnotation] = new Date()
+                        .toISOString()
+                        .replace(/\.\d{3}Z$/, 'Z'); // exact format: 2026-04-19T20:45:00Z
                     // we write the cr back to the file system
                     const newContent = catalog_common.io.toYaml(cr);
                     await promises_default().writeFile(filePath, newContent, 'utf-8');
@@ -368988,6 +369001,7 @@ function conditionsSorter(conditions) {
 
 
 
+
 async function upsertInitialStatus(pluralKind, namespace, item) {
     item = await getItemByItemPath(`${namespace}/${pluralKind}/${item.metadata.name}`);
     if (!('status' in item))
@@ -369003,6 +369017,11 @@ async function needsProvisioningOnCreateOrUpdate(cr) {
         operator_src_logger.debug(`The custom resource '${cr.kind}/${cr.metadata.name}' is missing a status and any conditions.`);
         return { needs: true, reason: 'CREATED' };
     }
+    // there is a force by annotation?
+    if (shouldForceReconcileByAnnotation(cr)) {
+        operator_src_logger.debug(`The custom resource '${cr.kind}/${cr.metadata.name}' has a newer '${catalog_common.generic.getFirestartrAnnotation('reconcile-at')}' annotation than the latest condition update time, so a force-reconcile will be triggered.`);
+        return { needs: true, reason: 'FORCE_RECONCILE_ANNOTATION' };
+    }
     // ERROR
     const errCond = getConditionByType(cr.status.conditions, 'ERROR');
     if (errCond && errCond.status === 'True') {
@@ -369038,6 +369057,36 @@ async function needsProvisioningOnCreateOrUpdate(cr) {
     operator_src_logger.debug(`Skipping the provisioning process for custom resource '${cr.kind}/${cr.metadata.name}' because its current state is not handled.`);
     return { needs: false };
 }
+function shouldForceReconcileByAnnotation(cr) {
+    const annotationType = catalog_common.generic.getFirestartrAnnotation('reconcile-at');
+    const annotationValue = cr.metadata?.annotations?.[annotationType];
+    if (!annotationValue) {
+        return false;
+    }
+    operator_src_logger.debug(`Found annotation '${annotationType}' with value '${annotationValue}' on ${cr.metadata.name}`);
+    const annotationTime = new Date(annotationValue).getTime();
+    if (isNaN(annotationTime)) {
+        operator_src_logger.warn(`Timestamp is invalid for the annotation ${cr.kind}/${cr.metadata?.name || 'unknown'}: ${annotationValue}`);
+        return false;
+    }
+    // Find the most recent timestamp across all conditions
+    let latestConditionTime = 0;
+    for (const condition of cr.status?.conditions || []) {
+        const timeStr = condition.lastUpdateTime || condition.lastTransitionTime;
+        if (timeStr) {
+            const conditionTime = new Date(timeStr).getTime();
+            if (!isNaN(conditionTime) && conditionTime > latestConditionTime) {
+                latestConditionTime = conditionTime;
+            }
+        }
+    }
+    const shouldForce = annotationTime > latestConditionTime;
+    operator_src_logger.debug(`Evaluating force-reconcile for ${cr.metadata.name}: annotation time (${new Date(annotationTime).toISOString()}) vs latest condition time (${new Date(latestConditionTime).toISOString()})`, { metadata: { shouldForce } });
+    if (shouldForce) {
+        operator_src_logger.info(`force-reconcile activated for ${cr.metadata.name} → annotation (${annotationValue}) is newer than latest condition time (${new Date(latestConditionTime).toISOString()})`);
+    }
+    return shouldForce;
+}
 async function updateSyncTransition(itemPath, reason, lastSyncTime, nextSyncTime, message, status) {
     operator_src_logger.info(`The item at '${itemPath}' transitioned to a new SYNCHRONIZED condition of '${status}'. The reason for the change is '${reason}' with the message: '${message}'.`);
     const k8sItem = await getItemByItemPath(itemPath);
@@ -370716,6 +370765,19 @@ function getQueueMetrics() {
         },
     };
 }
+// we need to assign weight to the deletion operation
+// to avoid blockades
+// https://github.com/prefapp/gitops-k8s/issues/1864
+// ghrepo feat | grss -> ghrepo -> ghgroup -> membership
+const DELETION_WEIGHTS = {
+    FirestartrGithubRepositoryFeature: 5,
+    FirestartrGithubRepositorySecretsSection: 4,
+    FirestartrGithubRepository: 3,
+    FirestartrGithubGroup: 2,
+    FirestartrGithubMembership: 1,
+    FirestartrTerraformWorkspace: 1,
+    FirestartrGithubOrgWebhook: 1,
+};
 // Do the kinds need different weights for the operations?
 // We need to discuss this with the team in this issue: https://github.com/prefapp/gitops-k8s/issues/524
 // const KIND_WEIGHTS: any = {
@@ -370785,7 +370847,17 @@ function sortQueue(queue) {
             // If weightA is larger, return -1 (a comes before b)
             return weightB - weightA;
         }
-        // --- SECONDARY SORT: By upsertTime (Ascending) ---
+        // in case of deletions we need to
+        // establish a secondary sort by kind
+        if (wa.operation === 'MARKED_TO_DELETION' &&
+            wb.operation === 'MARKED_TO_DELETION') {
+            const deletionWeightA = DELETION_WEIGHTS[wa.item.kind] || 0;
+            const deletionWeightB = DELETION_WEIGHTS[wb.item.kind] || 0;
+            if (deletionWeightA !== deletionWeightB) {
+                return deletionWeightB - deletionWeightA;
+            }
+        }
+        // --- 3rd SORT: By upsertTime (Ascending) ---
         // If weights are equal, sort by the oldest upsertTime (ascending)
         return wa.upsertTime - wb.upsertTime;
     });
@@ -379414,7 +379486,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = {"i8":"2.0.0"};
+const package_namespaceObject = JSON.parse('{"i8":"2.1.0-snapshot-1"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.0.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

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

@@ -4,6 +4,7 @@ export type NeedsCreationOrUpdate = {
 };
 export declare function upsertInitialStatus(pluralKind: string, namespace: string, item: any): Promise<void>;
 export declare function needsProvisioningOnCreateOrUpdate(cr: any): Promise<NeedsCreationOrUpdate>;
+export declare function shouldForceReconcileByAnnotation(cr: any): boolean;
 export declare function updateSyncTransition(itemPath: string, reason: string, lastSyncTime: string, nextSyncTime: string, message: string, status: string): Promise<void>;
 export declare function writePrioritizedStatus(kind: string, namespace: string, item: any): Promise<void>;
 export declare function updateTransition(itemPath: string, reason: string, type: string, statusValue: string, message?: string, updateStatusOnly?: boolean): Promise<void>;

package/package.json

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