@firestartr/cli 1.59.0-snapshot-6 → 1.59.0-snapshot-8

package/build/index.js

@@ -367329,12 +367329,36 @@ function compileReg(value) {
 
 
 
+const KIND_TO_COLLECTION_FILTERS = {
+    FirestartrGithubRepository: 'gh-repo',
+    FirestartrGithubGroup: 'gh-group',
+    FirestartrGithubMembership: 'gh-members',
+};
 // we create a special Collection that will use
 class ReimportCollection {
+    helperNameExtractor(cr) {
+        return cr.metadata.annotations['firestartr.dev/external-name'];
+    }
+    isSkipped(cr, generatedFilters) {
+        if (cr.kind in KIND_TO_COLLECTION_FILTERS) {
+            return this.IS_SKIP_SET(generatedFilters, KIND_TO_COLLECTION_FILTERS[cr.kind]);
+        }
+        else {
+            return false;
+        }
+    }
     isCrIncluded(cr, generatedFilters) {
-        return this.filter('cr', generatedFilters, [cr]).then((result) => {
-            return result.length > 0;
-        });
+        if (this.isSkipped(cr, generatedFilters)) {
+            return Promise.resolve(false);
+        }
+        if (cr.kind in KIND_TO_COLLECTION_FILTERS) {
+            return this.filter(KIND_TO_COLLECTION_FILTERS[cr.kind], generatedFilters, [this.helperNameExtractor(cr)]).then((result) => {
+                return result.length > 0;
+            });
+        }
+        else {
+            return Promise.resolve(false);
+        }
     }
 }
 applyCollectionMixins(ReimportCollection);
@@ -367344,6 +367368,7 @@ async function reimportGithubGitopsRepository(org, crsPath, configPath, generate
     const reImportAnnotation = catalog_common.generic.getFirestartrAnnotation('needs-re-import');
     // we need to perform a search in all the crsPath
     await searchCRs(crsPath, async (cr, filePath) => {
+        importer_src_logger.debug(`${JSON.stringify(cr)}`);
         // lets filter the cr with the generated filters, if it passes we annotate it with needs-re-import
         if (await collection.isCrIncluded(cr, generatedFilters)) {
             importer_src_logger.info(`Annotating ${cr.kind}/${cr.metadata.name} with ${reImportAnnotation} and ${importAnnotation}`);
@@ -367363,10 +367388,16 @@ async function searchCRs(dirname, functionToApply) {
     const files = await promises_default().readdir(dirname);
     for (const file of files) {
         if (file.endsWith('.yaml') || file.endsWith('.yml')) {
+            importer_src_logger.debug(`Processing file: ${file}`);
             const filePath = external_path_default().join(dirname, file);
             const content = await promises_default().readFile(filePath, 'utf-8');
             // let's use the catalog_common yaml loader
             const cr = catalog_common.io.fromYaml(content);
+            // let's check if the file is a valid file (i.e a CR)
+            if (!('kind' in cr) || !('metadata' in cr) || !('name' in cr.metadata)) {
+                importer_src_logger.debug(`File ${filePath} is not a valid CR, skipping...`);
+                continue;
+            }
             await functionToApply(cr, filePath);
         }
         else if (await reimporter_isDirectory(external_path_default().join(dirname, file))) {
@@ -378464,7 +378495,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"1.59.0-snapshot-6"}');
+const package_namespaceObject = JSON.parse('{"i8":"1.59.0-snapshot-8"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"1.58.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

package/package.json

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