@catladder/cli 1.145.0 → 1.146.0

package/src/utils/gitlab.ts

@@ -42,7 +42,7 @@ export const getGitlabToken = async (vorpal: CommandInstance | null) => {
   if (!(await hasGitlabToken())) {
     if (!vorpal) {
       console.error(
-        "⚠️ gitlab token missing, please run catladder to set it up"
+        "⚠️ gitlab token missing, please run catladder to set it up",
       );
       process.exit(1);
     }
@@ -56,7 +56,7 @@ export const doGitlabRequest = async <T = any>(
   vorpal: CommandInstance | null,
   path: string,
   data: any = undefined,
-  method: Method = "GET"
+  method: Method = "GET",
 ): Promise<T> => {
   const rootToken = await getGitlabToken(vorpal);
 
@@ -84,23 +84,23 @@ export const doGitlabRequest = async <T = any>(
   throw new Error(
     `Could not send request to gitlab api ${path}: ${result.status} "${
       result.statusText
-    }".\nResponse: ${JSON.stringify(await result.json(), null, 2)}`
+    }".\nResponse: ${JSON.stringify(await result.json(), null, 2)}`,
   );
 };
 
 export const getProjectInfo = async (
-  vorpal: CommandInstance | null
+  vorpal: CommandInstance | null,
 ): Promise<{ id: string; web_url: string }> => {
   const gitRemoteOriginUrl = (
     await exec("git config --get remote.origin.url")
   ).stdout.trim();
   const projectPath =
     /(https:\/\/|git@)git\.panter\.ch[:/]([^.]*)(\.git)?/g.exec(
-      gitRemoteOriginUrl
+      gitRemoteOriginUrl,
     );
   const project = await doGitlabRequest(
     vorpal,
-    `projects/${encodeURIComponent(projectPath[2])}`
+    `projects/${encodeURIComponent(projectPath[2])}`,
   );
   return project;
 };
@@ -114,28 +114,44 @@ type GitlabVariable = {
   environment_scope: string;
 };
 export const getAllVariables = memoizee(
-  async (vorpal: CommandInstance | null): Promise<Array<GitlabVariable>> => {
+  async (
+    vorpal: CommandInstance | null,
+    n = 5, // how many requests to do in parallel, 5 seems a good value for many projects, ideally we would do one request in parallel per component
+  ): Promise<Array<GitlabVariable>> => {
     const { id } = await getProjectInfo(vorpal);
+
     let all: Array<GitlabVariable> = [];
-    let result: Array<GitlabVariable>;
+    let result: Array<Array<GitlabVariable>> = [];
     let page = 1;
+
     do {
-      result = await doGitlabRequest(
-        vorpal,
-        // 100 is max page size
-        `projects/${id}/variables?per_page=100&page=${page}`
-      );
-      page++;
-      all = [...all, ...result];
-    } while (result?.length > 0);
+      // Create an array of promises for N pages
+      const promises = Array.from({ length: n }, (_, i) => {
+        return doGitlabRequest(
+          vorpal,
+          `projects/${id}/variables?per_page=100&page=${page + i}`,
+        );
+      });
+
+      // Wait for all promises to resolve
+      result = await Promise.all(promises);
+
+      // Increment the page by N
+      page += n;
+
+      // Flatten the result array and add it to 'all'
+      all = [...all, ...result.flat()];
+      // Continue only if the last page had results
+    } while (result.length > 0 && result[result.length - 1].length > 0);
+
     return all;
   },
-  { promise: true }
+  { promise: true },
 );
 
 export const getVariableValueByRawName = async (
   vorpal: CommandInstance,
-  rawName: string
+  rawName: string,
 ) => {
   const allVariables = await getAllVariables(vorpal);
   return allVariables.find((v) => v.key === rawName)?.value;
@@ -150,7 +166,7 @@ const createVariable = async (
   key: string,
   value: string,
   masked = true,
-  environment_scope = "*"
+  environment_scope = "*",
 ) => {
   return await doGitlabRequest(
     vorpal,
@@ -161,7 +177,7 @@ const createVariable = async (
       masked: masked && isMaskable(value),
       environment_scope,
     },
-    "POST"
+    "POST",
   );
 };
 
@@ -170,7 +186,7 @@ const updateVariable = async (
   projectId: string,
   key: string,
   value: string,
-  masked = true
+  masked = true,
 ) => {
   return await doGitlabRequest(
     vorpal,
@@ -179,20 +195,20 @@ const updateVariable = async (
       value,
       masked: masked && isMaskable(value),
     },
-    "PUT"
+    "PUT",
   );
 };
 
 const deleteVariable = async (
   vorpal: CommandInstance,
   projectId: string,
-  key: string
+  key: string,
 ) => {
   return await doGitlabRequest(
     vorpal,
     `projects/${projectId}/variables/${key}`,
     undefined,
-    "DELETE"
+    "DELETE",
   );
 };
 
@@ -233,7 +249,7 @@ const getAllCatladderEnvVarsInGitlab = async (vorpal: CommandInstance) => {
       }
 
       return acc;
-    }, {})
+    }, {}),
   );
   return allVariables;
 };
@@ -260,7 +276,7 @@ export const upsertAllVariables = async (
   env: string,
   componentName: string,
   backup = true,
-  masked = true // FIXME: would be better to have this per variable
+  masked = true, // FIXME: would be better to have this per variable
 ): Promise<void> => {
   const { id } = await getProjectInfo(vorpal);
 
@@ -286,7 +302,7 @@ export const upsertAllVariables = async (
             getBackupKey(fullKey, new Date().getTime()),
             oldValue,
             masked,
-            "_backup"
+            "_backup",
           );
         }
       } else {

package/src/utils/log.ts

@@ -1,7 +1,7 @@
 export const logError = (
   cmd: any,
   message: string,
-  additionalMessage?: any
+  additionalMessage?: any,
 ) => {
   cmd.log("");
   cmd.log(`[ERROR] 🙀 :${message}`);

package/src/utils/portForwards.ts

@@ -34,7 +34,7 @@ const addPortForward = (name: string, portForward: PortForward) => {
 
 export const startPortForwardCommand = async (
   name: string,
-  command: string
+  command: string,
 ) => {
   // stop if already there
   await stopPortForward(name);

package/src/utils/promise.ts

@@ -1,11 +1,13 @@
 export async function filter<T>(
   arr: T[],
-  iterator: (item: T) => Promise<boolean>
+  iterator: (item: T) => Promise<boolean>,
 ) {
   const fail = Symbol("fail");
-  return ((await Promise.all(
-    arr.map(async item => ((await iterator(item)) ? item : fail))
-  )).filter(i => i !== fail) as any) as Promise<T[]>;
+  return (
+    await Promise.all(
+      arr.map(async (item) => ((await iterator(item)) ? item : fail)),
+    )
+  ).filter((i) => i !== fail) as any as Promise<T[]>;
 }
 
-export const delay = (ms: number) => new Promise(res => setTimeout(res, ms));
+export const delay = (ms: number) => new Promise((res) => setTimeout(res, ms));