@catladder/cli 3.17.1 → 3.18.0

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "3.17.1",
+  "version": "3.18.0",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",

package/src/apps/cli/commands/project/setup/index.ts

@@ -4,6 +4,7 @@ import { setupAccessTokens } from "./setupAccessTokens";
 import { setupContext } from "./setupContext";
 import { setupTopic } from "./setupTopic";
 import { setupAgents } from "./setupAgents";
+import { logSection } from "./logSection";
 
 export const setupProject = async (
   instance: CommandInstance,
@@ -14,12 +15,16 @@ export const setupProject = async (
   allContext.forEach((context) => {
     instance.log(` - ${context.name}:${context.env}`);
   });
+
+  await logSection(instance, "base setup", async () => {
+    await setupAccessTokens(instance);
+    await setupTopic(instance);
+    await setupAgents(instance);
+  });
   for (const context of allContext) {
     await setupContext(instance, context);
   }
-  await setupAccessTokens(instance);
-  await setupTopic(instance);
-  await setupAgents(instance);
+
   instance.log("");
   instance.log("gitlab is ready! 🥂");
   instance.log("\n");

package/src/apps/cli/commands/project/setup/logSection.ts

@@ -0,0 +1,22 @@
+import type { CommandInstance } from "vorpal";
+
+export const logSection = async (
+  instance: CommandInstance,
+  title: string,
+  work: () => Promise<void>,
+) => {
+  instance.log("");
+  instance.log(
+    "==================================================================================",
+  );
+  instance.log("🐱 🔧 " + title + "...");
+  instance.log("");
+  await work();
+  instance.log("");
+  instance.log("✅    " + title + " done!");
+  instance.log("");
+  instance.log(
+    "==================================================================================",
+  );
+  instance.log("");
+};

package/src/apps/cli/commands/project/setup/setupContext.ts

@@ -4,29 +4,24 @@ import type { CommandInstance } from "vorpal";
 import { setupCloudRun } from "./setupCloudRun";
 
 import { setupKubernetes } from "./setupKubernetes";
+import { logSection } from "./logSection";
 
 export const setupContext = async (
   instance: CommandInstance,
   context: ComponentContext,
 ) => {
-  instance.log("");
-  instance.log(
-    "==================================================================================",
-  );
-
-  instance.log("🐱 🔧 setting up " + context.env + ":" + context.name + "...");
-  instance.log("");
-  if (isOfDeployType(context.deploy?.config, "google-cloudrun")) {
-    await setupCloudRun(instance, context);
-  }
-
-  const deployConfig = context.deploy?.config;
-  if (isOfDeployType(deployConfig, "kubernetes")) {
-    await setupKubernetes(instance, context);
-  }
+  await logSection(
+    instance,
+    "setting up " + context.env + ":" + context.name,
+    async () => {
+      if (isOfDeployType(context.deploy?.config, "google-cloudrun")) {
+        await setupCloudRun(instance, context);
+      }
 
-  instance.log("");
-  instance.log("✅ " + context.env + ":" + context.name + " done!");
-
-  instance.log("");
+      const deployConfig = context.deploy?.config;
+      if (isOfDeployType(deployConfig, "kubernetes")) {
+        await setupKubernetes(instance, context);
+      }
+    },
+  );
 };