@catladder/cli 1.41.2 → 1.41.4

package/package.json

@@ -24,7 +24,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "1.41.2",
+    "@catladder/pipeline": "1.41.4",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",
@@ -58,5 +58,5 @@
     "update-notifier": "^5",
     "vorpal": "^1.12.0"
   },
-  "version": "1.41.2"
+  "version": "1.41.4"
 }

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

@@ -0,0 +1,19 @@
+import type { Context } from "@catladder/pipeline";
+import { getCloudSQLConfig, hasCloudSQL } from "@catladder/pipeline";
+import type { CommandInstance } from "vorpal";
+
+export const setupCloudSQL = async (
+  instance: CommandInstance,
+  context: Context
+) => {
+  if (!hasCloudSQL(context)) {
+    throw new Error("cannot setup cloudsql, as it has none");
+  }
+  const config = getCloudSQLConfig(context);
+  instance.log("");
+  instance.log(
+    "! make sure to provide cloudsqlProxyCredentials for the cloud sql service account in " +
+      config.projectId
+  );
+  instance.log("");
+};

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

@@ -1,6 +1,8 @@
-import type { Context} from "@catladder/pipeline";
-import { isOfDeployType } from "@catladder/pipeline";
+import type { Context } from "@catladder/pipeline";
+import { isOfDeployType, hasCloudSQL } from "@catladder/pipeline";
 import type { CommandInstance } from "vorpal";
+import { setupCloudSQL } from "./setupCloudSQL";
+
 import { setupKubernetes } from "./setupKubernetes";
 
 export const setupContext = async (
@@ -20,6 +22,10 @@ export const setupContext = async (
       "..."
   );
   instance.log("");
+  if (hasCloudSQL(context)) {
+    await setupCloudSQL(instance, context);
+  }
+
   const deployConfig = context.componentConfig.deploy;
   if (isOfDeployType(deployConfig, "kubernetes")) {
     await setupKubernetes(instance, context);

package/src/apps/cli/verify/migration/migrateSecrets.ts

@@ -23,7 +23,11 @@ export const migrateSecrets = async (
     const secrets = load(yamlstring);
 
     Object.keys(newConfig.components).forEach(async (componentName) => {
-      const environment = getEnvironment(newConfig, componentName, newEnv);
+      const environment = await getEnvironment(
+        newConfig,
+        componentName,
+        newEnv
+      );
       await upsertAllVariables(
         vorpal,
         pick(secrets, environment.secretEnvVarKeys),

package/src/config/getProjectConfig.ts

@@ -1,11 +1,10 @@
-import type {
-  Config} from "@catladder/pipeline";
+import type { Config } from "@catladder/pipeline";
 import {
   readConfigSync,
   getAllEnvs,
   getEnvironment as _getEnvironment,
   createContext,
-  getSecretVarName
+  getSecretVarName,
 } from "@catladder/pipeline";
 
 import type { CommandInstance } from "vorpal";
@@ -67,7 +66,7 @@ export const getPipelineContextByChoice = async (
   componentName: string
 ) => {
   const config = await getProjectConfig();
-  return createContext(config, componentName, env);
+  return await createContext(config, componentName, env);
 };
 export const getAllComponentsWithAllEnvsFlat = async (): Promise<
   Array<{ env: string; componentName: string }>