@catladder/cli 1.90.0 → 1.91.1

package/package.json

@@ -24,7 +24,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "1.90.0",
+    "@catladder/pipeline": "1.91.1",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",
@@ -57,5 +57,5 @@
     "typescript": "^4.5.4",
     "vorpal": "^1.12.0"
   },
-  "version": "1.90.0"
+  "version": "1.91.1"
 }

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

@@ -1,4 +1,5 @@
 import type { Context } from "@catladder/pipeline";
+import { createKubernetesCloudsqlBaseValues } from "@catladder/pipeline";
 import { isOfDeployType } from "@catladder/pipeline";
 import { spawn } from "child-process-promise";
 import { writeFile } from "fs-extra";
@@ -60,35 +61,14 @@ export default async (vorpal: Vorpal) =>
       );
       this.log("");
 
-      // legacy, some projects have the cloudsqlProxyCredentials in the secrets
-      // actually it works without, if the current local shell user has access to the db through google cloud
-      const cloudsqlProxyCredentials = await getGitlabVar(
-        this,
-        env,
-        componentName,
-        "cloudsqlProxyCredentials"
-      );
-
-      await withFile(async ({ path: tmpFilePath }) => {
-        if (cloudsqlProxyCredentials) {
-          await writeFile(tmpFilePath, cloudsqlProxyCredentials);
+      await spawn(
+        "cloud_sql_proxy",
+        ["-instances", `${instanceName}=tcp:${localPort}`],
+        {
+          stdio: "inherit",
+          shell: true,
         }
-
-        await spawn(
-          "cloud_sql_proxy",
-          [
-            "-instances",
-            `${instanceName}=tcp:${localPort}`,
-            ...(cloudsqlProxyCredentials
-              ? ["-credential_file", tmpFilePath]
-              : []),
-          ],
-          {
-            stdio: "inherit",
-            shell: true,
-          }
-        );
-      });
+      );
     });
 
 const getProxyInfoForKubernetes = async (
@@ -103,24 +83,14 @@ const getProxyInfoForKubernetes = async (
     context.environment.shortName,
     context.componentName
   );
+  // bit hacky, would be nicer if we would also declare this through env vars
+  const cloudSqlValues = createKubernetesCloudsqlBaseValues(context);
 
   const DB_PASSWORD = envVars?.DB_PASSWORD || envVars?.POSTGRESQL_PASSWORD;
 
-  const DB_NAME = context.environment.envVars.KUBE_APP_NAME;
-
-  const values = context.componentConfig.deploy.values;
-
-  const projectId =
-    values?.cloudsql?.projectId ||
-    context.componentConfig.deploy.cluster?.projectId;
-
-  const defaultInstanceId = `${context.fullConfig.customerName}-${context.fullConfig.appName}-${context.environment.shortName}`;
-  const instanceId = values?.cloudsql?.instanceId || defaultInstanceId;
-
-  const defaultRegion = "europe-west6"; // currently hardcoded
-  const region = values?.cloudsql?.region || defaultRegion;
+  const DB_NAME = cloudSqlValues.cloudsql.fullDbName;
 
-  const instanceName = `${projectId}:${region}:${instanceId}`;
+  const instanceName = cloudSqlValues.cloudsql.instanceConnectionName;
 
   return {
     instanceName,

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

@@ -1,8 +1,8 @@
 import type { Context } from "@catladder/pipeline";
-import { isOfDeployType, hasKubernetesCloudSQL } from "@catladder/pipeline";
+import { isOfDeployType } from "@catladder/pipeline";
 import type { CommandInstance } from "vorpal";
 import { setupCloudRun } from "./setupCloudRun";
-import { setupCloudSQL } from "./setupCloudSQL";
+
 import { setupKubernetes } from "./setupKubernetes";
 
 export const setupContext = async (
@@ -25,9 +25,6 @@ export const setupContext = async (
   if (isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
     await setupCloudRun(instance, context);
   }
-  if (hasKubernetesCloudSQL(context)) {
-    await setupCloudSQL(instance, context);
-  }
 
   const deployConfig = context.componentConfig.deploy;
   if (isOfDeployType(deployConfig, "kubernetes")) {

package/dist/apps/cli/commands/project/setup/setupCloudSQL.d.ts

@@ -1,3 +0,0 @@
-import type { Context } from "@catladder/pipeline";
-import type { CommandInstance } from "vorpal";
-export declare const setupCloudSQL: (instance: CommandInstance, context: Context) => Promise<void>;

package/dist/apps/cli/commands/project/setup/setupCloudSQL.js

@@ -1,56 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-exports.__esModule = true;
-exports.setupCloudSQL = void 0;
-var pipeline_1 = require("@catladder/pipeline");
-var setupCloudSQL = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var config;
-    return __generator(this, function (_a) {
-        if (!(0, pipeline_1.hasKubernetesCloudSQL)(context)) {
-            throw new Error("cannot setup cloudsql, as it has none");
-        }
-        config = (0, pipeline_1.getKubernetesCloudSQLConfig)(context);
-        instance.log("");
-        instance.log("! make sure to provide cloudsqlProxyCredentials for the cloud sql service account in " +
-            config.projectId);
-        instance.log("");
-        return [2 /*return*/];
-    });
-}); };
-exports.setupCloudSQL = setupCloudSQL;
-//# sourceMappingURL=setupCloudSQL.js.map

package/dist/apps/cli/commands/project/setup/setupCloudSQL.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"setupCloudSQL.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupCloudSQL.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAG6B;AAGtB,IAAM,aAAa,GAAG,UAC3B,QAAyB,EACzB,OAAgB;;;QAEhB,IAAI,CAAC,IAAA,gCAAqB,EAAC,OAAO,CAAC,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;SAC1D;QACK,MAAM,GAAG,IAAA,sCAA2B,EAAC,OAAO,CAAC,CAAC;QACpD,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACjB,QAAQ,CAAC,GAAG,CACV,uFAAuF;YACrF,MAAM,CAAC,SAAS,CACnB,CAAC;QACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;KAClB,CAAC;AAdW,QAAA,aAAa,iBAcxB"}

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

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