@firestartr/cli 1.59.0-snapshot-1 → 1.59.0-snapshot-3

package/build/index.js

@@ -367130,7 +367130,7 @@ async function setPreviousCRs(resourcesPath) {
     }
     previousCRs = alreadyImportedCrs;
 }
-async function importGithubGitopsRepository(org, skipPlan, claimsPath, resourcesPath, configPath, filters = [], needsReImport) {
+async function importGithubGitopsRepository(org, skipPlan, claimsPath, resourcesPath, configPath, filters = [], needsReImport, force) {
     await setPreviousCRs(resourcesPath);
     configurePaths(randomFolder, '/tmp/tmp-resources', // Not used, but required by renderer
     configPath);
@@ -367157,9 +367157,9 @@ async function importGithubGitopsRepository(org, skipPlan, claimsPath, resources
             crs[key] = cr;
         }
     }
-    await moveCRsAndClaims(crs, org, claimsPath, resourcesPath);
+    await moveCRsAndClaims(crs, org, claimsPath, resourcesPath, force);
 }
-async function moveCRsAndClaims(crs, org, claimsPath, resourcesPath) {
+async function moveCRsAndClaims(crs, org, claimsPath, resourcesPath, force) {
     const importedResources = [];
     const failedImportedResources = [];
     for (const k of Object.keys(crs)) {
@@ -367167,7 +367167,8 @@ async function moveCRsAndClaims(crs, org, claimsPath, resourcesPath) {
             importer_src_logger.info(`⚡ SKIP IMPORT: CR is a catalog entity, skipping import with kind: ${crs[k].kind} and name: ${crs[k].metadata.name}`);
             continue;
         }
-        else if (previousCRs[`${crs[k].kind}-${crs[k].metadata.annotations[catalog_common.generic.getFirestartrAnnotation('external-name')]}`]) {
+        else if (previousCRs[`${crs[k].kind}-${crs[k].metadata.annotations[catalog_common.generic.getFirestartrAnnotation('external-name')]}`] &&
+            !force) {
             importer_src_logger.info(`⚡ SKIP IMPORT: CR already exists on disk, skipping import with kind: ${crs[k].kind} and name: ${crs[k].metadata.name}`);
             continue;
         }
@@ -367335,7 +367336,7 @@ async function runImporter(force, skipPlan, claimsPath, crsPath, configPath, cla
     //gh-repo,REGEXP=.*vite.*
     cdk8s_renderer.setPath('claimsDefaults', claimsDefaultsPath);
     generatedFilters = buildFilters(filters, force, crsPath, generatedFilters);
-    await importGithubGitopsRepository(org, skipPlan, claimsPath, crsPath, configPath, generatedFilters, needsReimport);
+    await importGithubGitopsRepository(org, skipPlan, claimsPath, crsPath, configPath, generatedFilters, needsReimport, force);
 }
 function buildFilters(filters, force, crsPath, generatedFilters) {
     filters.push('all,FUNCTION=fCheckCRExistsOnDisk');
@@ -367344,6 +367345,7 @@ function buildFilters(filters, force, crsPath, generatedFilters) {
      */
     generatedFilters = filtersBuilder(createSkipFilters(filters || []), {
         fCheckCRExistsOnDisk: async function (collectionKind, name) {
+            console.log(`Name ${name} && ${force}`);
             if (force)
                 return true;
             else {
@@ -374173,13 +374175,25 @@ class EntityGHRepo extends base_Entity {
                 id: this.cr.name,
             },
         });
-        for (const file of this.document.config.files) {
+        // we cannot ensure the files exist, thus we need to check
+        // it they exist before importing them
+        //for (const file of this.document.config.files) {
+        //  this.patchImportData({
+        //    op: PatchOperations.add,
+        //    path: '/imports/-',
+        //    value: {
+        //      to: `github_repository_file.this["${file.file}__${file.branch}"]`,
+        //      id: `${this.cr.name}:${file.file}:${file.branch}`,
+        //    },
+        //  });
+        //}
+        for (const variable of this.document.config.variables) {
             this.patchImportData({
                 op: PatchOperations.add,
                 path: '/imports/-',
                 value: {
-                    to: `github_repository_file.this["${file.file}__${file.branch}"]`,
-                    id: `${this.cr.name}:${file.file}:${file.branch}`,
+                    to: `github_actions_variable.this["${variable.variableName}"]`,
+                    id: `${this.cr.name}:${variable.variableName}`,
                 },
             });
         }
@@ -378379,7 +378393,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"1.59.0-snapshot-1"}');
+const package_namespaceObject = JSON.parse('{"i8":"1.59.0-snapshot-3"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"1.58.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

package/build/packages/importer/src/decanter/index.d.ts

@@ -10,7 +10,7 @@ export declare const collections: {
 };
 export declare function isInPreviousCRs(kind: string, name: string): boolean;
 export declare function setPreviousCRs(resourcesPath: string): Promise<void>;
-export declare function importGithubGitopsRepository(org: string, skipPlan: boolean, claimsPath: string, resourcesPath: string, configPath: string, filters: CollectionFilter[], needsReImport: boolean): Promise<void>;
+export declare function importGithubGitopsRepository(org: string, skipPlan: boolean, claimsPath: string, resourcesPath: string, configPath: string, filters: CollectionFilter[], needsReImport: boolean, force: boolean): Promise<void>;
 export declare function getPreviousCrs(crsPath: string): Promise<void>;
 declare const _default: {
     importGithubGitopsRepository: typeof importGithubGitopsRepository;

package/package.json

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