@firestartr/cli 1.39.3-SNAPSHOT → 1.39.3-SNAPSHOT2

package/build/index.js

@@ -287108,6 +287108,7 @@ const kindMap = {
     user: 'UserClaim',
     group: 'GroupClaim',
     system: 'SystemClaim',
+    secret: 'SecretsClaim',
 };
 function extractRefs(renderClaims, kind) {
     const result = {};
@@ -287191,6 +287192,7 @@ function getClaimReferences(claim) {
     const listItemRegex = catalog_common.types.regex.YAMLListItemRegex;
     const inlineListRegex = catalog_common.types.regex.YAMLInlineListRegex;
     const valueRegex = catalog_common.types.regex.GenericRefRegex;
+    const secretRegex = catalog_common.types.regex.SecretRefRegex;
     const refs = [];
     let multilineMargin = -1;
     for (const line of claim.split('\n')) {
@@ -287225,6 +287227,16 @@ function getClaimReferences(claim) {
                 refs.push(resolveFirestartrRef(ref));
             }
         }
+        else if (lineValue.match(secretRegex)) {
+            lineValue = lineValue
+                .replace(/"/g, '')
+                .replace(/'/g, '')
+                .replace(/\$/g, '')
+                .replace(/\{/g, '')
+                .replace(/\s/g, '');
+            const secretRef = lineValue.split('.')[0];
+            refs.push(resolveFirestartrRef(secretRef));
+        }
         else if (lineValue.match(multilineRegex)) {
             multilineMargin = line.length - line.trimStart().length;
         }
@@ -297949,7 +297961,7 @@ async function publishApply(item, applyOutput, kind) {
     const dividedOutput = github_0.pulls.divideCommentIntoChunks(applyOutput, 250);
     let currentCommentNo = 1;
     for (const commentContent of dividedOutput) {
-        const comment = `<h1> 
+        const comment = `<h1>
 <img  width="25"  src="https://static-00.iconduck.com/assets.00/file-type-terraform-icon-1821x2048-mbxeegff.png"> Terraform apply
 </h1>
 <p><b>${kind}: </b>${item.metadata.name}</p>
@@ -298016,8 +298028,8 @@ async function publishPlan(item, planOutput, prNumber, repo, org) {
     try {
         const dividedOutput = github_0.pulls.divideCommentIntoChunks(planOutput, 250);
         let currentCommentNo = 1;
-        dividedOutput.forEach(async (commentContent) => {
-            const comment = `<h1> 
+        for (const commentContent of dividedOutput) {
+            const comment = `<h1>
 <img  width="25"  src="https://static-00.iconduck.com/assets.00/file-type-terraform-icon-1821x2048-mbxeegff.png"> Terraform plan
 </h1>
 <p><b>TFWorkspace: </b>${item.metadata.name}</p>
@@ -298031,7 +298043,7 @@ ${commentContent}
 </details>`;
             await github_0.pulls.commentInPR(comment, prNumber, repo, org);
             currentCommentNo += 1;
-        });
+        }
     }
     catch (e) {
         console.error(e);
@@ -300532,27 +300544,27 @@ function processOperationPlan_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}
     `;
     }
@@ -300576,22 +300588,22 @@ async function processOperationPlan_publishPlan(item, planOutput) {
             throw new Error('No repo found in CR');
         const dividedOutput = github_0.pulls.divideCommentIntoChunks(planOutput, 250);
         let currentCommentNo = 1;
-        dividedOutput.forEach(async (commentContent) => {
-            const comment = `<h1> 
+        for (const commentContent of dividedOutput) {
+            const comment = `<h1>
   <img  width="25"  src="https://static-00.iconduck.com/assets.00/file-type-terraform-icon-1821x2048-mbxeegff.png"> Terraform plan
   </h1>
   <p><b>TFWorkspace: </b>${item.metadata.name}</p>
-  
+
   <details id=github>
   <summary>PLAN LOGS ${dividedOutput.length > 1 ? '(Part ' + currentCommentNo + ')' : ''}</summary>
-  
+
   \`\`\`shell
   ${commentContent}
   \`\`\`
   </details>`;
             await github_0.pulls.commentInPR(comment, parseInt(prNumber), repo, org);
             currentCommentNo += 1;
-        });
+        }
     }
     catch (e) {
         console.error(e);
@@ -300838,10 +300850,10 @@ async function tfWorkspacePlan(opts) {
         await addPlanStatusCheck(pull, tfOutput, 'completed');
     }
     catch (e) {
-        tfworkspaceplans_fDebug(`Error: ${e}`, 'error');
-        await addPlanStatusCheck(pull, e, 'completed', true);
+        tfworkspaceplans_fDebug(`Error: ${e.message}`, 'error');
+        await addPlanStatusCheck(pull, e.message, 'completed', true);
         tfworkspaceplans_fDebug('Publishing plan');
-        await publishPlan(cr, e, prNumber, repo, owner);
+        await publishPlan(cr, e.message, prNumber, repo, owner);
     }
 }
 function getCommandByStatus(status) {
@@ -300948,7 +300960,7 @@ async function tfPlanner(claimFilePath, claim, namespace, debug, jobTtl, cmd = '
     job.spec = new client.V1JobSpec();
     if (jobTtl)
         job.spec.ttlSecondsAfterFinished = jobTtl;
-    job.spec.template = controllerDeploy.spec
+    job.spec.template = controllerDeploy.body.spec
         .template;
     job.spec.template.spec.containers[0].command = [
         'sh',

package/build/packages/github/src/branches.d.ts

@@ -428,7 +428,7 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
                 verified_at: string;
             };
         };
-        author: Record<string, never> | {
+        author: {
             name?: string;
             email?: string;
             login: string;
@@ -451,8 +451,8 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
             site_admin: boolean;
             starred_at?: string;
             user_view_type?: string;
-        };
-        committer: Record<string, never> | {
+        } | Record<string, never>;
+        committer: {
             name?: string;
             email?: string;
             login: string;
@@ -475,7 +475,7 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
             site_admin: boolean;
             starred_at?: string;
             user_view_type?: string;
-        };
+        } | Record<string, never>;
         parents: {
             sha: string;
             url: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "1.39.3-SNAPSHOT+PR934",
+  "version": "1.39.3-SNAPSHOT2+PR934",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",