@catladder/cli 1.136.1 → 1.136.4

package/package.json

@@ -52,7 +52,7 @@
     }
   ],
   "license": "MIT",
-  "version": "1.136.1",
+  "version": "1.136.4",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
@@ -71,7 +71,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "1.136.1",
+    "@catladder/pipeline": "1.136.4",
     "@gitbeaker/rest": "^39.28.0",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",

package/src/apps/catci/catci.ts

@@ -2,6 +2,10 @@ import Vorpal from "vorpal";
 import packageInfo from "../../packageInfos";
 import securityCommands from "./commands/security/commands";
 
+function reconstructArgs(args: string[]): string {
+  return [args[0], ...args.slice(1).map((arg) => `"${arg}"`)].join(" ");
+}
+
 export async function runCatCi() {
   const vorpal = new Vorpal();
 
@@ -14,7 +18,9 @@ export async function runCatCi() {
   if (isInteractive) {
     vorpal.log(`Catladder CI Tools 😻🔨 version ${packageInfo.version}`).show();
   } else {
-    await vorpal.exec(process.argv.slice(2).join(" "));
+    process.exitCode = 1;
+    const args = reconstructArgs(process.argv.slice(2));
+    await vorpal.exec(args);
     process.exit();
   }
 }

package/src/apps/catci/commands/security/commands.ts

@@ -8,6 +8,7 @@ import {
   SECURITY_AUDIT_FILE_NAME,
   createSecurityAuditMergeRequest,
 } from "./createSecurityAuditMergeRequest";
+import { Err, Ok, type Result } from "ts-results-es";
 
 const GITLAB_HOST = "https://git.panter.ch";
 
@@ -17,6 +18,17 @@ export default function (vorpal: Vorpal) {
   commandCreate(vorpal);
 }
 
+type ActionFunc = (args: Vorpal.Args) => Promise<void>;
+
+function resultAsExitCode(
+  func: (args: Vorpal.Args) => Promise<Result<unknown, unknown>>
+): ActionFunc {
+  return async (args: Vorpal.Args) => {
+    const result = await func(args);
+    process.exitCode = result.isErr() ? 1 : 0;
+  };
+}
+
 async function commandCiJob(vorpal: Vorpal) {
   vorpal
     .command(
@@ -30,56 +42,55 @@ async function commandCiJob(vorpal: Vorpal) {
 <user-id> gitlab user id that will be assignee of the audit
 `
     )
-    .action(async (args) => {
-      const evaluation = await evaluateSecurityAudit({ path: args.path });
-
-      if (evaluation.isErr()) {
-        console.log("could not evaluate security audit document");
-        console.log(
-          "creating new merge request with security audit template..."
-        );
-
-        const { token, mainBranch, projectId, userId } = args;
-        const api = new Gitlab({
-          host: GITLAB_HOST,
-          token,
-        });
+    .action(
+      resultAsExitCode(async (args) => {
+        const evaluation = await evaluateSecurityAudit({ path: args.path });
+
+        if (evaluation.isErr()) {
+          console.log("could not evaluate security audit document");
+          console.log(
+            "creating new merge request with security audit template..."
+          );
 
-        const mr = await createSecurityAuditMergeRequest({
-          api,
-          mainBranch,
-          projectId,
-          userId: parseInt(userId),
-        });
+          const { token, mainBranch, projectId, userId } = args;
+          const api = new Gitlab({
+            host: GITLAB_HOST,
+            token,
+          });
+
+          const mr = await createSecurityAuditMergeRequest({
+            api,
+            mainBranch,
+            projectId,
+            userId: parseInt(userId),
+          });
+
+          if (mr.isErr()) {
+            console.error(
+              `could not create merge request with security audit template: ${mr.error}`
+            );
+            return mr;
+          }
+
+          console.log("security audit merge request created successfully");
+          console.log(
+            `please finish the MR by updating SECURITY.md document: ${mr.value.web_url}`
+          );
+          return Err("merge request created" as const);
+        }
 
-        if (mr.isErr()) {
+        if (evaluation.value.score.answeredTopics === 0) {
+          console.error("audit document has no answered topics");
           console.error(
-            `could not create merge request with security audit template: ${mr.error}`
+            `please answer security topics in ${SECURITY_AUDIT_FILE_NAME} by adding responsible people and check/cross in the table`
           );
-          process.exitCode = 1;
-          return;
+          return Err("audit document has no answered topics" as const);
         }
 
-        console.log("security audit merge request created successfully");
-        console.log(
-          `please finish the MR by updating SECURITY.md document: ${mr.value.web_url}`
-        );
-        process.exitCode = 1;
-        return;
-      }
-
-      if (evaluation.value.score.answeredTopics === 0) {
-        console.error("audit document has no answered topics");
-        console.error(
-          `please answer security topics in ${SECURITY_AUDIT_FILE_NAME} by adding responsible people and check/cross in the table`
-        );
-        process.exitCode = 1;
-        return;
-      }
-
-      process.exitCode = 0;
-      console.log(makeSecurityAuditOverview(evaluation.value));
-    });
+        console.log(makeSecurityAuditOverview(evaluation.value));
+        return Ok({});
+      })
+    );
 }
 
 async function commandEvaluate(vorpal: Vorpal) {
@@ -88,20 +99,22 @@ async function commandEvaluate(vorpal: Vorpal) {
       "security-audit-evaluate <path>",
       "Evaluates security audit document in given <path>"
     )
-    .action(async (args) => {
-      console.log("evaluating security audit document...");
-
-      const result = await evaluateSecurityAudit({ path: args.path });
-      if (result.isErr()) {
-        console.error(result.error);
-        console.error(
-          `please make sure the security audit document ${SECURITY_AUDIT_FILE_NAME} is in the repository`
-        );
-        process.exitCode = 1;
-      } else {
-        console.log(makeSecurityAuditOverview(result.value));
-      }
-    });
+    .action(
+      resultAsExitCode(async (args) => {
+        console.log("evaluating security audit document...");
+
+        const result = await evaluateSecurityAudit({ path: args.path });
+        if (result.isErr()) {
+          console.error(result.error);
+          console.error(
+            `please make sure the security audit document ${SECURITY_AUDIT_FILE_NAME} is in the repository`
+          );
+        } else {
+          console.log(makeSecurityAuditOverview(result.value));
+        }
+        return result;
+      })
+    );
 }
 
 async function commandCreate(vorpal: Vorpal) {
@@ -116,31 +129,33 @@ async function commandCreate(vorpal: Vorpal) {
 <user-id> gitlab user id that will be assignee of the audit
 `
     )
-    .action(async (args) => {
-      const { token, mainBranch, projectId, userId } = args;
-
-      const api = new Gitlab({
-        host: GITLAB_HOST,
-        token,
-      });
-
-      const result = await createSecurityAuditMergeRequest({
-        api,
-        mainBranch,
-        projectId,
-        userId: parseInt(userId),
-      });
-
-      if (result.isErr()) {
-        console.error(
-          `could not create security audit merge request: ${result.error}`
-        );
-        process.exitCode = 1;
-      } else {
-        console.log("security audit merge request created successfully");
-        console.log(
-          `please finish the MR by updating SECURITY.md document: ${result.value.web_url}`
-        );
-      }
-    });
+    .action(
+      resultAsExitCode(async (args) => {
+        const { token, mainBranch, projectId, userId } = args;
+
+        const api = new Gitlab({
+          host: GITLAB_HOST,
+          token,
+        });
+
+        const result = await createSecurityAuditMergeRequest({
+          api,
+          mainBranch,
+          projectId,
+          userId: parseInt(userId),
+        });
+
+        if (result.isErr()) {
+          console.error(
+            `could not create security audit merge request: ${result.error}`
+          );
+        } else {
+          console.log("security audit merge request created successfully");
+          console.log(
+            `please finish the MR by updating SECURITY.md document: ${result.value.web_url}`
+          );
+        }
+        return result;
+      })
+    );
 }

package/src/gcloud/serviceAccounts.ts

@@ -69,7 +69,8 @@ const upsertGcloudServiceAccount = async (
   }
 
   return await exec(
-    `gcloud iam service-accounts keys create /dev/stdout --iam-account=${fullIdentifier}`
+    // on some platforms /dev/stdout is not available without the pipe
+    `gcloud iam service-accounts keys create /dev/stdout --iam-account=${fullIdentifier} | cat`
   ).then((o) => o.stdout);
 };