@catladder/cli 0.0.0-refactor-docker-de6b3576 → 0.0.0-refactor-docker-c24f8608

package/package.json

@@ -52,7 +52,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-refactor-docker-de6b3576",
+  "version": "0.0.0-refactor-docker-c24f8608",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",

package/src/apps/catenv/catenv.ts

@@ -11,13 +11,14 @@ export default async (choice?: Choice) => {
     return;
   }
 
-  if (config.pipelineType) {
-    await generatePipelineFiles(config, config.pipelineType, "local");
-  }
-
-  await writeDotEnvFiles(config, choice);
+  await Promise.all([
+    config.pipelineType
+      ? generatePipelineFiles(config, config.pipelineType, "local")
+      : undefined,
+    writeDotEnvFiles(config, choice),
 
-  await writeDTsFiles(config, choice);
+    writeDTsFiles(config, choice),
 
-  await printVariables(config, choice);
+    printVariables(config, choice),
+  ]);
 };

package/src/apps/cli/commands/project/commandCloudSqlProxy.ts

@@ -1,4 +1,4 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import {
   createKubernetesCloudsqlBaseValues,
   isOfDeployType,
@@ -79,7 +79,7 @@ export default async (vorpal: Vorpal) =>
 
 const getProxyInfoForKubernetes = async (
   vorpal: CommandInstance,
-  context: Context,
+  context: ComponentContext,
 ): Promise<ProxyInfo> => {
   if (!isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
     throw new Error("unsupported");
@@ -109,7 +109,7 @@ const getProxyInfoForKubernetes = async (
 
 const getProxyInfoForCloudRun = async (
   vorpal: CommandInstance,
-  context: Context,
+  context: ComponentContext,
 ): Promise<ProxyInfo> => {
   if (
     !isOfDeployType(context.componentConfig.deploy, "google-cloudrun") ||

package/src/apps/cli/commands/project/commandPortForward.ts

@@ -8,7 +8,7 @@ import ensureCluster from "./utils/ensureCluster";
 import type { CommandInstance } from "vorpal";
 import { parseChoice } from "../../../../config/parseChoice";
 import { getPipelineContextByChoice } from "../../../../config/getProjectConfig";
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import { isOfDeployType } from "@catladder/pipeline";
 import { startPortForwardCommand } from "../../../../utils/portForwards";
 import open from "open";
@@ -44,7 +44,10 @@ const kubePortForward = async (cmd: CommandInstance, envComponent: string) => {
   return startKubePortForward(podName, localPort, remotePort, namespace);
 };
 
-const cloudRunPortForward = async (cmd: CommandInstance, context: Context) => {
+const cloudRunPortForward = async (
+  cmd: CommandInstance,
+  context: ComponentContext,
+) => {
   if (!isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
     throw new Error("not cloud run");
   }

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

@@ -1,4 +1,4 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import {
   GCLOUD_DEPLOY_CREDENTIALS_KEY,
   GCLOUD_RUN_CANONICAL_HOST_SUFFIX,
@@ -14,7 +14,7 @@ import { upsertAllVariables } from "../../../../../utils/gitlab";
 
 export const setupCloudRun = async (
   instance: CommandInstance,
-  context: Context,
+  context: ComponentContext,
 ) => {
   if (!isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
     throw new Error("deploy config is not of type 'google-cloudrun'");

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

@@ -1,4 +1,4 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import { isOfDeployType } from "@catladder/pipeline";
 import type { CommandInstance } from "vorpal";
 import { setupCloudRun } from "./setupCloudRun";
@@ -7,7 +7,7 @@ import { setupKubernetes } from "./setupKubernetes";
 
 export const setupContext = async (
   instance: CommandInstance,
-  context: Context,
+  context: ComponentContext,
 ) => {
   instance.log("");
   instance.log(

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

@@ -1,4 +1,4 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import {
   getFullKubernetesClusterName,
   isOfDeployType,
@@ -15,7 +15,7 @@ import ensureNamespace from "../utils/ensureNamespace";
 
 export const setupKubernetes = async (
   instance: CommandInstance,
-  context: Context,
+  context: ComponentContext,
 ) => {
   const deployConfig = context.componentConfig.deploy;
   if (!isOfDeployType(deployConfig, "kubernetes")) {

package/src/apps/cli/commands/project/utils/ensureNamespace.ts

@@ -1,10 +1,10 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import { getKubernetesNamespace } from "@catladder/pipeline";
 import type { V1ObjectMeta } from "@kubernetes/client-node";
 import { V1Namespace } from "@kubernetes/client-node";
 import { getk8sApi } from "../../../../../k8sApi";
 
-export default async function (context: Context) {
+export default async function (context: ComponentContext) {
   const namespace = getKubernetesNamespace(
     context.fullConfig,
     context.environment.shortName,

package/src/config/getProjectConfig.ts

@@ -3,7 +3,7 @@ import {
   readConfigSync,
   getAllEnvs,
   getEnvironment as _getEnvironment,
-  createContext,
+  createComponentContext,
   getSecretVarName,
 } from "@catladder/pipeline";
 
@@ -53,7 +53,7 @@ export const getPipelineContextByChoice = async (
   componentName: string,
 ) => {
   const config = await getProjectConfig();
-  return await createContext({
+  return await createComponentContext({
     config,
     componentName,
     env,

package/src/gcloud/cloudRun/openCloudRunDashboards.ts

@@ -1,11 +1,11 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import { isOfDeployType } from "@catladder/pipeline";
 import type { CommandInstance } from "vorpal";
 import { openGoogleCloudDashboard } from "../openDashboard";
 
 export const openGoogleCloudRunDashboard = async (
   instance: CommandInstance,
-  context: Context,
+  context: ComponentContext,
 ) => {
   if (!isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
     throw new Error("deploy type is not google-cloudrun ");

package/src/gcloud/serviceAccounts.ts

@@ -1,4 +1,4 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 
 import { exec } from "child-process-promise";
 import { createHmac } from "crypto";
@@ -22,7 +22,7 @@ type ServiceAccount = {
   description: string;
 };
 const upsertGcloudServiceAccount = async (
-  context: Context,
+  context: ComponentContext,
   account: ServiceAccount,
 ): Promise<string> => {
   const { projectId, name, displayName, roles, description } = account;
@@ -76,7 +76,7 @@ const upsertGcloudServiceAccount = async (
 
 export const upsertGcloudServiceAccountAndSaveSecret = async (
   instance: CommandInstance,
-  context: Context,
+  context: ComponentContext,
   account: ServiceAccount,
   secretName: string,
 ): Promise<void> => {

package/src/kubernetes/openKubernetesDashboards.ts

@@ -1,11 +1,11 @@
-import type { Context } from "@catladder/pipeline";
+import type { ComponentContext } from "@catladder/pipeline";
 import { isOfDeployType } from "@catladder/pipeline";
 import type { CommandInstance } from "vorpal";
 import { openGoogleCloudDashboard } from "../gcloud/openDashboard";
 
 export const openGoogleCloudLogs = async (
   instance: CommandInstance,
-  context: Context,
+  context: ComponentContext,
 ) => {
   const deployConfig = context.componentConfig.deploy;
   if (!isOfDeployType(deployConfig, "kubernetes")) {
@@ -31,7 +31,7 @@ export const openGoogleCloudLogs = async (
 
 export const openGoogleCloudKubernetesDashboard = async (
   instance: CommandInstance,
-  context: Context,
+  context: ComponentContext,
 ) => {
   const deployConfig = context.componentConfig.deploy;
   if (!isOfDeployType(deployConfig, "kubernetes")) {

package/src/utils/gitlab.ts

@@ -114,20 +114,36 @@ 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 },