@firestartr/cli 1.46.0-snapshot-0 → 1.46.0-snapshot-1

package/build/index.js

@@ -262633,8 +262633,8 @@ function sleep(ms) {
 }
 
 // EXTERNAL MODULE: ../../node_modules/lodash/lodash.js
-var lodash = __nccwpck_require__(78018);
-var lodash_default = /*#__PURE__*/__nccwpck_require__.n(lodash);
+var lodash_lodash = __nccwpck_require__(78018);
+var lodash_default = /*#__PURE__*/__nccwpck_require__.n(lodash_lodash);
 ;// CONCATENATED MODULE: ../catalog_common/src/generic/name.ts
 
 
@@ -270668,11 +270668,11 @@ class name_NameNormalizer extends Normalizer {
                     const provider = helperCTX(this).provider;
                     const annotation = catalog_common.generic.getFirestartrAnnotation('external-name');
                     const providerName = claim.providers[provider].name;
-                    if (previousCR && !lodash.isEmpty(previousCR)) {
+                    if (previousCR && !lodash_lodash.isEmpty(previousCR)) {
                         cr.metadata.annotations[annotation] = providerName;
                         cr.metadata.name = previousCR.metadata.name;
                         if (previousCR.writeConnectionSecretToRef &&
-                            !lodash.isEmpty(previousCR.writeConnectionSecretToRef)) {
+                            !lodash_lodash.isEmpty(previousCR.writeConnectionSecretToRef)) {
                             cr.writeConnectionSecretToRef.name =
                                 previousCR.writeConnectionSecretToRef.name;
                         }
@@ -271481,7 +271481,7 @@ function config_getRenamesEnabled() {
 function setRenamesEnabled(enabled) {
     renamesEnabled = enabled;
 }
-var AllowedProviders;
+var config_AllowedProviders;
 (function (AllowedProviders) {
     AllowedProviders["all"] = "all";
     AllowedProviders["github"] = "github";
@@ -271490,7 +271490,7 @@ var AllowedProviders;
     AllowedProviders["catalog"] = "catalog";
     AllowedProviders["argocd"] = "argocd";
     AllowedProviders["externalSecrets"] = "externalSecrets";
-})(AllowedProviders || (AllowedProviders = {}));
+})(config_AllowedProviders || (config_AllowedProviders = {}));
 let configuredProvider = null;
 function configureProvider(provider) {
     if (configuredProvider)
@@ -271511,12 +271511,12 @@ function config_getConfiguredProvider() {
     return configuredProvider;
 }
 const PROVIDER_CLAIM_CR_MAP = {
-    [AllowedProviders.github.toString()]: {
+    [config_AllowedProviders.github.toString()]: {
         GroupClaim: 'FirestartrGithubGroup',
         UserClaim: 'FirestartrGithubMembership',
         ComponentClaim: 'FirestartrGithubRepository',
     },
-    [AllowedProviders.catalog.toString()]: {
+    [config_AllowedProviders.catalog.toString()]: {
         GroupClaim: 'Group',
         UserClaim: 'User',
         ComponentClaim: 'Component',
@@ -271538,7 +271538,7 @@ function configurePathsForRendering() {
     const configPath = '/tmp/defaults';
     createInitializers(configPath);
     createExpanders(configPath);
-    configureProvider(AllowedProviders.all);
+    configureProvider(config_AllowedProviders.all);
     setPath('initializers', configPath);
     setPath('crs', '/tmp/resources_from_main_branch');
     setPath('globals', configPath);
@@ -273722,6 +273722,7 @@ function extractAllRefs(claimData) {
             break;
         }
     }
+    refsExtractor_log(`Refs for ${parsedClaim.kind}-${parsedClaim.name}: ${[...new Set(refs)].join(',')}`);
     return [...new Set(refs)];
 }
 function extractVirtualRefs(parsedClaim) {
@@ -274438,7 +274439,7 @@ function getOrg() {
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/validations/wellKnownStructures.ts
 
-function isCollaborator(struc) {
+function wellKnownStructures_isCollaborator(struc) {
     return hasProperties(struc, ['collaborator', 'role']);
 }
 function hasProperties(struc, properties) {
@@ -274450,7 +274451,7 @@ function hasProperties(struc, properties) {
     return true;
 }
 function hasProperty(struc, property) {
-    return lodash_default().has(struc, property);
+    return lodash.has(struc, property);
 }
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/validations/references.ts
@@ -274541,7 +274542,7 @@ Check the following Claims to ensure that the tfStateKey is unique:
  */
 function validateReferencesInCR(cr, crs) {
     if (isCatalogEntity(cr)) {
-        if (config_getConfiguredProvider() === AllowedProviders.catalog) {
+        if (getConfiguredProvider() === AllowedProviders.catalog) {
             //validateCatalogEntities(cr, crs);
             //console.log(`Skip validation ${cr.name}`);
         }
@@ -274573,7 +274574,7 @@ function throwIfRefNotFoundInCatalog(crs, refObj, refStr, crStr) {
  */
 function validateNonCatalogEntities(cr, crs) {
     for (const rel of references_WELL_KNOWN_RELATIONS[cr.kind] || []) {
-        const propertyRef = lodash_default().get(cr, rel);
+        const propertyRef = _.get(cr, rel);
         if (!propertyRef) {
             throw new Error(`CR ${cr.kind} ${cr.metadata.name} does not have property ${rel}`);
         }
@@ -276201,7 +276202,7 @@ async function* resolveClaimEntries(claimRefsList) {
             }
         }
         catch (err) {
-            throw `Error processing: ${claimEntry}: ${err}`;
+            throw new Error(`Error processing: ${claimEntry}: ${err}`);
         }
     }
 }
@@ -276213,25 +276214,26 @@ async function* resolveDirEntries(dir) {
         entries = await (0,promises_namespaceObject.readdir)(dir, { withFileTypes: true });
     }
     catch (err) {
-        throw `Reading dir: ${dir}: ${err}`;
+        throw new Error(`Reading dir: ${dir}: ${err}`);
     }
     for (const entry of entries) {
         const fullPath = external_path_default().join(dir, entry.name);
-        if (entry.isDirectory(fullPath)) {
+        if (entry.isDirectory()) {
             yield* resolveDirEntries(fullPath);
         }
-        else if (entry.isFile(fullPath) && entry.name.match(/\.yaml$|\.yml$/)) {
-            claimUtils_log(`Sending entry ${resolveClaimFileRef(fullPath)} (${fullPath})`);
-            yield resolveClaimFileRef(fullPath);
+        else if (entry.isFile() && entry.name.match(/\.yaml$|\.yml$/)) {
+            const claimRef = await resolveClaimFileRef(fullPath);
+            claimUtils_log(`Sending entry ${claimRef} (${fullPath})`);
+            yield claimRef;
         }
     }
 }
-function resolveClaimFileRef(claimFile) {
+async function resolveClaimFileRef(claimFile) {
     try {
-        const data = external_fs_default().readFileSync(claimFile, 'utf-8');
+        const data = await external_fs_default().promises.readFile(claimFile, 'utf-8');
         const claim = catalog_common.io.fromYaml(data);
         if (!('kind' in claim && 'name' in claim)) {
-            throw 'Invalid claim file has not kind and/or name';
+            throw new Error('Invalid claim file has not kind and/or name');
         }
         else {
             const claimRef = `${claim.kind}-${claim.name}`;
@@ -276239,7 +276241,7 @@ function resolveClaimFileRef(claimFile) {
         }
     }
     catch (err) {
-        throw `Error: file ${claimFile}: ${err}`;
+        throw new Error(`Error: file ${claimFile}: ${err}`);
     }
 }
 
@@ -279603,7 +279605,7 @@ async function renderClaims(catalogScope, firestartrScope, data) {
             const claim = renderClaims[claimKey].claim;
             const configuredProvider = config_getConfiguredProvider().toString();
             let providers = Object.keys(claim.providers);
-            if (configuredProvider !== AllowedProviders.all.toString()) {
+            if (configuredProvider !== config_AllowedProviders.all.toString()) {
                 providers = providers.filter((provider) => provider === configuredProvider);
             }
             const previousCR = getPreviousCRfromClaim(claim, crs);
@@ -279651,11 +279653,11 @@ async function renderClaim(catalogScope, firestartrScope, claim, patches, previo
     const renderPatches = patches.filter((patch) => !patch.isPostPatch);
     const postPatches = patches.filter((patch) => patch.isPostPatch);
     const provider = config_getConfiguredProvider();
-    const loadGithub = (provider === AllowedProviders.all ||
-        provider === AllowedProviders.catalog ||
-        provider === AllowedProviders.github) &&
+    const loadGithub = (provider === config_AllowedProviders.all ||
+        provider === config_AllowedProviders.catalog ||
+        provider === config_AllowedProviders.github) &&
         'github' in claim.providers;
-    const loadCatalog = provider === AllowedProviders.all || provider === AllowedProviders.catalog;
+    const loadCatalog = provider === config_AllowedProviders.all || provider === config_AllowedProviders.catalog;
     switch (claim.kind) {
         case 'DomainClaim':
             if (loadCatalog) {
@@ -279693,8 +279695,8 @@ async function renderClaim(catalogScope, firestartrScope, claim, patches, previo
             break;
         case 'TFWorkspaceClaim':
             if (claim.providers.terraform &&
-                (provider === AllowedProviders.terraform ||
-                    provider === AllowedProviders.all)) {
+                (provider === config_AllowedProviders.terraform ||
+                    provider === config_AllowedProviders.all)) {
                 firestartrEntity = new charts.TFWorkspaceChart(firestartrScope, `terraform-${chartId}`, firestartrId, claim, renderPatches);
             }
             if (loadCatalog) {
@@ -279703,9 +279705,9 @@ async function renderClaim(catalogScope, firestartrScope, claim, patches, previo
             break;
         case 'SecretsClaim':
             if (claim.providers.external_secrets &&
-                (provider === AllowedProviders.externalSecrets ||
-                    provider === AllowedProviders.terraform ||
-                    provider === AllowedProviders.all)) {
+                (provider === config_AllowedProviders.externalSecrets ||
+                    provider === config_AllowedProviders.terraform ||
+                    provider === config_AllowedProviders.all)) {
                 firestartrEntity = new charts.SecretsChart(firestartrScope, chartId, firestartrId, claim, []);
             }
             if (loadCatalog) {
@@ -279714,8 +279716,8 @@ async function renderClaim(catalogScope, firestartrScope, claim, patches, previo
             break;
         case 'ArgoDeployClaim':
             if (claim.providers.argocd &&
-                (provider === AllowedProviders.argocd ||
-                    provider === AllowedProviders.all)) {
+                (provider === config_AllowedProviders.argocd ||
+                    provider === config_AllowedProviders.all)) {
                 firestartrEntity = new charts.ArgoDeployChart(firestartrScope, `argocd-${chartId}`, firestartrId, claim, renderPatches);
             }
             if (loadCatalog) {
@@ -279783,9 +279785,9 @@ async function renderClaim(catalogScope, firestartrScope, claim, patches, previo
 async function renderer_render(catalogScope, firestartrScope, activateReferentialIntegrityValidation = true, claimList) {
     const data = await loadClaimsList(claimList);
     const result = await renderClaims(catalogScope, firestartrScope, data);
-    if (activateReferentialIntegrityValidation) {
-        validateReferentialIntegrity(result);
-    }
+    //if (activateReferentialIntegrityValidation) {
+    //  validateReferentialIntegrity(result);
+    //}
     validateTfStateKeyUniqueness(result);
     return result;
 }
@@ -280071,7 +280073,7 @@ async function addLastStateAndLastClaimAnnotations(filePath, lastStatePRLink, la
     INITIALIZERS: INITIALIZERS,
     INITIALIZERS_BY_FILE_NAME: INITIALIZERS_BY_FILE_NAME,
     NORMALIZERS: NORMALIZERS,
-    AllowedProviders: AllowedProviders,
+    AllowedProviders: config_AllowedProviders,
     runComparer: runComparer,
     isCatalogEntity: isCatalogEntity,
     loadCRs: loadCRs,
@@ -281152,7 +281154,7 @@ function compileReg(value) {
 //    gh-group: 'FirestartrGithubGroup',
 //    gh-repo: 'FirestartrGithubRepository',
 //  }
-async function runImporter(force, generateDefaults, skipPlan, claimsPath, crsPath, configPath, claimsDefaultsPath, org, filters, provider = AllowedProviders.all) {
+async function runImporter(force, generateDefaults, skipPlan, claimsPath, crsPath, configPath, claimsDefaultsPath, org, filters, provider = config_AllowedProviders.all) {
     configureProvider(provider);
     let generatedFilters = [];
     //gh-repo,REGEXP=.*vite.*

package/build/packages/cdk8s_renderer/src/utils/claimUtils.d.ts

@@ -2,4 +2,4 @@ export declare function resolveStringReference(reference: string): any;
 export declare function claimsRefListAsGenerator(refs: string[]): AsyncGenerator<string, void, unknown>;
 export declare function resolveClaimFilesList(claimRefsList: string): string[];
 export declare function resolveClaimEntries(claimRefsList: string[]): AsyncGenerator<string, void, unknown>;
-export declare function resolveClaimFileRef(claimFile: string): string;
+export declare function resolveClaimFileRef(claimFile: string): Promise<string>;

package/package.json

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