@firestartr/cli 1.45.0-snapshot-11 → 1.45.0-snapshot-12

package/build/index.js

@@ -262837,7 +262837,7 @@ const TFWorkspaceRefRegex = new RegExp(`\\$\\{\\{\\s*tfworkspace\\:(${regModuleN
 const SecretRefRegex = new RegExp(`\\$\\{\\{\\s*secret\\:(${regModuleName.source})\\.(${regModuleName.source})\\s*\\}\\}`, 'ig');
 const GroupRefRegex = new RegExp(`group\\:(${regModuleName.source})`, 'ig');
 const TFWorkspaceRefCR = new RegExp(`\\$\\{\\{\\s*references\\.(${regModuleName.source})\\s*\\}\\}`, 'i');
-const GenericRefRegex = new RegExp(`user:${regModuleName.source}|group:${regModuleName.source}|system:${regModuleName.source}`, 'gm');
+const GenericRefRegex = new RegExp(`^["']?(user:${regModuleName.source}|group:${regModuleName.source}|system:${regModuleName.source})["']?$`, 'gm');
 const YAMLHeaderRegex = new RegExp(/^\s*(\w+:\s?)/);
 const YAMLListItemRegex = new RegExp(/^\s*(-\s)/);
 const YAMLInlineListRegex = new RegExp(/^\s*(\[.+\])/);
@@ -271648,7 +271648,6 @@ async function crawlWithExclusions(dir, filter, exec, excludedPaths = []) {
         }, exec);
     }
     catch (err) {
-        console.log(err);
         throw `Crawling with exclusions: ${dir}: ${err}`;
     }
 }
@@ -271674,7 +271673,6 @@ async function crawler_crawl(dir, filter, exec) {
         });
     }
     catch (err) {
-        console.log(err);
         throw `Crawling ${dir}: ${err}`;
     }
 }
@@ -271735,14 +271733,13 @@ async function crawlDirectory(dirEnt, exec) {
     for (const entry of entries) {
         const testDir = await isDir(entry);
         if (testDir) {
-            slurps.push(crawlDirectory(entry, exec));
+            slurps.push(() => crawlDirectory(entry, exec));
         }
         else {
-            slurps.push(slurpFile(entry, exec));
+            slurps.push(() => slurpFile(entry, exec));
         }
     }
-    return Promise.all(slurps).catch((err) => {
-        console.error(err);
+    return Promise.all(slurps.map((f) => f())).catch((err) => {
         throw `crawlDirectory: ${err} on ${dirEnt}`;
     });
 }
@@ -274231,8 +274228,13 @@ async function loadClaims(claimsPath = config_getPath('claims')) {
         if (!('kind' in claim && 'name' in claim)) {
             throw new Error(`Invalid claim file ${entry}`);
         }
-        validateClaim(claim, base[`${claim.kind}Schema`]);
-        await optionalValidation(claim);
+        try {
+            validateClaim(claim, base[`${claim.kind}Schema`]);
+            await optionalValidation(claim);
+        }
+        catch (err) {
+            throw new Error(`Validating ${claim.kind + '-' + claim.name}: ${JSON.stringify(err, null, 2)}`);
+        }
         if (result[`${claim.kind}-${claim.name}`]) {
             throw new Error(`Duplicate claim ${claim.kind}-${claim.name}`);
         }
@@ -279986,7 +279988,13 @@ async function runRenderer(globalsPath, initializersPath, claimsPath, crsPath, c
     if (claimRefs) {
         claimRefsList = claimRefs.replace(/\s/g, '').split(',');
     }
-    await renderer_render(catalogApp, firestartrApp, validateReferentialIntegrity === 'enabled' ? true : false, claimRefsList);
+    try {
+        await renderer_render(catalogApp, firestartrApp, validateReferentialIntegrity === 'enabled' ? true : false, claimRefsList);
+    }
+    catch (error) {
+        console.log(`Rendering the system: \n ${error}`);
+        process.exit(1);
+    }
     catalogApp.synth();
     firestartrApp.synth();
 }
@@ -281748,6 +281756,7 @@ async function writePlanInGithubPR(prUrl, planText) {
 }
 async function addApplyCommitStatus(cr, state, targetURL = '', description = '', context = '') {
     try {
+        await addCommitStatusToHeadCommit(cr.metadata.annotations['firestartr.dev/last-claim-pr'], state, targetURL, description, context);
         await addCommitStatusToPrMergeCommit(cr.metadata.annotations['firestartr.dev/last-state-pr'], state, targetURL, description, context);
     }
     catch (e) {
@@ -281789,6 +281798,12 @@ async function addCommitStatusToPrMergeCommit(prAnnotationValue, state, targetUR
     fDebug(`Adding commit status to ${prAnnotationValue} for owner ${owner}, repo ${repo} and SHA ${branchSha}`);
     await github_0.repo.addCommitStatus(state, branchSha, repo, owner, targetURL, description, context);
 }
+async function addCommitStatusToHeadCommit(prAnnotationValue, state, targetURL, description, context) {
+    const { owner, repo, prNumber } = catalog_common.generic.getOwnerRepoPrNumberFromAnnotationValue(prAnnotationValue);
+    const branchSha = await github_0.pulls.getPrLastCommitSHA(prNumber, repo, owner);
+    fDebug(`Adding commit status to ${prAnnotationValue} for owner ${owner}, repo ${repo} and SHA ${branchSha}`);
+    await github_0.repo.addCommitStatus(state, branchSha, repo, owner, targetURL, description, context);
+}
 async function getLastStatePrInfo(cr) {
     try {
         const prInfo = cr.metadata.annotations['firestartr.dev/last-state-pr'];
@@ -285051,7 +285066,8 @@ async function* doApply(item, op, handler) {
         }
         const deps = await handler.resolveReferences();
         cdktf_log('Item %s has the following dependencies: %O', item.metadata.name, deps);
-        if (item.metadata.annotations['firestartr.dev/last-state-pr'] || false) {
+        if ((item.metadata.annotations['firestartr.dev/last-claim-pr'] || false) &&
+            (item.metadata.annotations['firestartr.dev/last-state-pr'] || false)) {
             await addApplyCommitStatus(item, 'pending', catalog_common.generic.getPrLinkFromAnnotationValue(item.metadata.annotations['firestartr.dev/last-state-pr']), 'Performing apply operation...', `Terraform Apply ${item.metadata.name}`);
         }
         const applyOutput = await provisioner.runProvisioner({
@@ -285087,7 +285103,8 @@ async function* doApply(item, op, handler) {
             message: 'doApply',
         };
         await handler.writeTerraformOutputInTfResult(item, output);
-        if (item.metadata.annotations['firestartr.dev/last-state-pr'] || false) {
+        if ((item.metadata.annotations['firestartr.dev/last-claim-pr'] || false) &&
+            (item.metadata.annotations['firestartr.dev/last-state-pr'] || false)) {
             await addApplyCommitStatus(item, 'success', catalog_common.generic.getPrLinkFromAnnotationValue(item.metadata.annotations['firestartr.dev/last-state-pr']), 'Apply operation completed', `Terraform Apply ${item.metadata.name}`);
         }
         handler.success();
@@ -285123,7 +285140,8 @@ async function* doApply(item, op, handler) {
             status: 'False',
             message: error.toString(),
         };
-        if (item.metadata.annotations['firestartr.dev/last-state-pr'] || false) {
+        if ((item.metadata.annotations['firestartr.dev/last-claim-pr'] || false) &&
+            (item.metadata.annotations['firestartr.dev/last-state-pr'] || false)) {
             await addApplyCommitStatus(item, 'failure', catalog_common.generic.getPrLinkFromAnnotationValue(item.metadata.annotations['firestartr.dev/last-state-pr']), 'Apply operation failed', `Terraform Apply ${item.metadata.name}`);
         }
         handler.error();
@@ -286459,7 +286477,8 @@ async function* process_operation_doApply(item, op, handler) {
         const deps = await handler.resolveReferences();
         process_operation_log('Item %s has the following dependencies: %O', item.metadata.name, deps);
         const context = buildProvisionerContext(item, deps);
-        if (item.metadata.annotations['firestartr.dev/last-state-pr'] || false) {
+        if ((item.metadata.annotations['firestartr.dev/last-claim-pr'] || false) &&
+            (item.metadata.annotations['firestartr.dev/last-state-pr'] || false)) {
             await addApplyCommitStatus(item, 'pending', catalog_common.generic.getPrLinkFromAnnotationValue(item.metadata.annotations['firestartr.dev/last-state-pr']), 'Performing apply operation...', `Terraform Apply ${item.metadata.name}`);
         }
         const applyOutput = await runTerraformProvisioner(context, 'apply');
@@ -286494,7 +286513,8 @@ async function* process_operation_doApply(item, op, handler) {
             message: 'doApply',
         };
         await handler.writeTerraformOutputInTfResult(item, output);
-        if (item.metadata.annotations['firestartr.dev/last-state-pr'] || false) {
+        if ((item.metadata.annotations['firestartr.dev/last-claim-pr'] || false) &&
+            (item.metadata.annotations['firestartr.dev/last-state-pr'] || false)) {
             await addApplyCommitStatus(item, 'success', catalog_common.generic.getPrLinkFromAnnotationValue(item.metadata.annotations['firestartr.dev/last-state-pr']), 'Apply operation completed', `Terraform Apply ${item.metadata.name}`);
         }
         handler.success();
@@ -286524,7 +286544,8 @@ async function* process_operation_doApply(item, op, handler) {
             status: 'False',
             message: JSON.stringify(e),
         };
-        if (item.metadata.annotations['firestartr.dev/last-state-pr'] || false) {
+        if ((item.metadata.annotations['firestartr.dev/last-claim-pr'] || false) &&
+            (item.metadata.annotations['firestartr.dev/last-state-pr'] || false)) {
             await addApplyCommitStatus(item, 'failure', catalog_common.generic.getPrLinkFromAnnotationValue(item.metadata.annotations['firestartr.dev/last-state-pr']), 'Apply operation failed', `Terraform Apply ${item.metadata.name}`);
         }
         handler.error();
@@ -286767,27 +286788,27 @@ function getErrorOutputMessage(cr, key, ref) {
         return `
 
     ❌ No output ${key} found in secret '${ref.secret.metadata.name}' .
-
+    
     ❗❕ Your terraform project has not the output '${key}' .
-
+    
     Maybe you forgot to add it or your reference is wrong.
-
+    
     🔗 Terraform project: ${cr.spec.module}
-
+   
     🖹 Output example:
-
+   
     ... your terraform code ...
-
+   
     # missing output
     output '${key}' {
       value = <your_value>
     }
-
+    
     `;
     }
     else if (cr.spec.source === 'Inline') {
         return `❗❕ Could not find output '${key}' in inline module:
-
+    
       ${cr.spec.module}
     `;
     }

package/package.json

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