@catladder/cli 0.0.0-main-3b6d4049 → 0.0.0-main-5f142cf2

package/dist/types/types.d.ts

@@ -1,4 +1,3 @@
-export declare type Env = "dev-local" | "prod" | "dev" | "stage" | "review";
 export declare type KubernetesSecretName = string;
 export interface ISecrets {
     [key: string]: KubernetesSecretName;

package/dist/utils/cluster.d.ts

@@ -1,5 +1,12 @@
 export declare const getCurrentContext: () => Promise<any>;
 export declare const getCurrentConnectedClusterName: () => Promise<string>;
+export declare const getClusterByFullName: (fullName: string) => {
+    name: string;
+    cluster: import("../config/clusters").Cluster;
+};
 export declare const getClusterByName: (name: string) => import("../config/clusters").Cluster;
+export declare const getAllClusters: () => {
+    [clustername: string]: import("../config/clusters").Cluster;
+};
 export declare const getAllClusterNames: () => string[];
 export declare const connectToCluster: (clusterName: string) => Promise<void>;

package/dist/utils/cluster.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.connectToCluster = exports.getAllClusterNames = exports.getClusterByName = exports.getCurrentConnectedClusterName = exports.getCurrentContext = void 0;
+exports.connectToCluster = exports.getAllClusterNames = exports.getAllClusters = exports.getClusterByName = exports.getClusterByFullName = exports.getCurrentConnectedClusterName = exports.getCurrentContext = void 0;
 const child_process_promise_1 = require("child-process-promise");
 const lodash_1 = require("lodash");
 const clusters_1 = __importDefault(require("../config/clusters"));
@@ -14,10 +14,22 @@ const getCurrentConnectedClusterName = async () => {
     return (0, lodash_1.findKey)(clusters_1.default, { fullName: currentContext });
 };
 exports.getCurrentConnectedClusterName = getCurrentConnectedClusterName;
-const getClusterByName = (name) => {
-    return clusters_1.default[name];
+const getClusterByFullName = (fullName) => {
+    const found = Object.entries((0, exports.getAllClusters)()).find(([, config]) => config.fullName === fullName);
+    if (found) {
+        return { name: found[0], cluster: found[1] };
+    }
+    else {
+        return null;
+    }
 };
+exports.getClusterByFullName = getClusterByFullName;
+const getClusterByName = (name) => (0, exports.getAllClusters)()[name];
 exports.getClusterByName = getClusterByName;
+const getAllClusters = () => {
+    return clusters_1.default;
+};
+exports.getAllClusters = getAllClusters;
 const getAllClusterNames = () => Object.keys(clusters_1.default);
 exports.getAllClusterNames = getAllClusterNames;
 const connectToCluster = async (clusterName) => {

package/dist/utils/cluster.js.map

@@ -1 +1 @@
-{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../src/utils/cluster.ts"],"names":[],"mappings":";;;;;;AAAA,iEAA6C;AAC7C,mCAAiC;AACjC,kEAA0C;AACnC,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE,CAC1C,CAAC,MAAM,IAAA,4BAAI,EAAC,gCAAgC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;AADlD,QAAA,iBAAiB,qBACiC;AAExD,MAAM,8BAA8B,GAAG,KAAK,IAAI,EAAE;IACvD,MAAM,cAAc,GAAG,MAAM,IAAA,yBAAiB,GAAE,CAAC;IACjD,OAAO,IAAA,gBAAO,EAAC,kBAAQ,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;AACzD,CAAC,CAAC;AAHW,QAAA,8BAA8B,kCAGzC;AAEK,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE;IAC/C,OAAO,kBAAQ,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEK,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAQ,CAAC,CAAC;AAAjD,QAAA,kBAAkB,sBAA+B;AAEvD,MAAM,gBAAgB,GAAG,KAAK,EAAE,WAAmB,EAAE,EAAE;IAC5D,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,wBAAgB,EAAC,WAAW,CAAC,CAAC;IAClD,MAAM,OAAO,EAAE,CAAC;AAClB,CAAC,CAAC;AAHW,QAAA,gBAAgB,oBAG3B"}
+{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../src/utils/cluster.ts"],"names":[],"mappings":";;;;;;AAAA,iEAA6C;AAC7C,mCAAiC;AACjC,kEAA0C;AACnC,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE,CAC1C,CAAC,MAAM,IAAA,4BAAI,EAAC,gCAAgC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;AADlD,QAAA,iBAAiB,qBACiC;AAExD,MAAM,8BAA8B,GAAG,KAAK,IAAI,EAAE;IACvD,MAAM,cAAc,GAAG,MAAM,IAAA,yBAAiB,GAAE,CAAC;IACjD,OAAO,IAAA,gBAAO,EAAC,kBAAQ,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;AACzD,CAAC,CAAC;AAHW,QAAA,8BAA8B,kCAGzC;AAEK,MAAM,oBAAoB,GAAG,CAAC,QAAgB,EAAE,EAAE;IACvD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,IAAA,sBAAc,GAAE,CAAC,CAAC,IAAI,CACjD,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAC7C,CAAC;IACF,IAAI,KAAK,EAAE;QACT,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9C;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AATW,QAAA,oBAAoB,wBAS/B;AAEK,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAA,sBAAc,GAAE,CAAC,IAAI,CAAC,CAAC;AAA5D,QAAA,gBAAgB,oBAA4C;AAElE,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,OAAO,kBAAQ,CAAC;AAClB,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB;AAEK,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAQ,CAAC,CAAC;AAAjD,QAAA,kBAAkB,sBAA+B;AAEvD,MAAM,gBAAgB,GAAG,KAAK,EAAE,WAAmB,EAAE,EAAE;IAC5D,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,wBAAgB,EAAC,WAAW,CAAC,CAAC;IAClD,MAAM,OAAO,EAAE,CAAC;AAClB,CAAC,CAAC;AAHW,QAAA,gBAAgB,oBAG3B"}

package/dist/utils/editAsFile.d.ts

@@ -0,0 +1 @@
+export declare const editAsFile: <T>(inObject: T) => Promise<T>;

package/dist/utils/editAsFile.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.editAsFile = void 0;
+const tmp_promise_1 = require("tmp-promise");
+const js_yaml_1 = __importDefault(require("js-yaml"));
+const fs_extra_1 = require("fs-extra");
+const getEditor_1 = __importDefault(require("./getEditor"));
+const editAsFile = async (inObject) => {
+    const asString = js_yaml_1.default.safeDump(inObject);
+    let newContent;
+    await (0, tmp_promise_1.withFile)(async ({ path: tmpFilePath }) => {
+        await (0, fs_extra_1.writeFile)(tmpFilePath, asString);
+        await (await (0, getEditor_1.default)()).open(tmpFilePath);
+        newContent = js_yaml_1.default.load((await (0, fs_extra_1.readFile)(tmpFilePath)).toString("utf-8"));
+    }, { postfix: ".yml" });
+    return newContent;
+};
+exports.editAsFile = editAsFile;
+//# sourceMappingURL=editAsFile.js.map

package/dist/utils/editAsFile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"editAsFile.js","sourceRoot":"","sources":["../../src/utils/editAsFile.ts"],"names":[],"mappings":";;;;;;AAAA,6CAAuC;AACvC,sDAA2B;AAE3B,uCAA+C;AAC/C,4DAAoC;AAE7B,MAAM,UAAU,GAAG,KAAK,EAAK,QAAW,EAAc,EAAE;IAC7D,MAAM,QAAQ,GAAG,iBAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,UAAU,CAAC;IAEf,MAAM,IAAA,sBAAQ,EACZ,KAAK,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE;QAC9B,MAAM,IAAA,oBAAS,EAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,IAAA,mBAAS,GAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC5C,UAAU,GAAG,iBAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAA,mBAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1E,CAAC,EACD,EAAE,OAAO,EAAE,MAAM,EAAE,CACpB,CAAC;IAEF,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAdW,QAAA,UAAU,cAcrB"}

package/dist/utils/gitlab.d.ts

@@ -1,6 +1,6 @@
 import { CommandInstance } from "vorpal";
 export declare const getGitlabToken: (vorpal: CommandInstance) => Promise<any>;
-export declare const doGitlabRequest: (vorpal: CommandInstance, path: string, data?: any) => Promise<any>;
+export declare const doGitlabRequest: <T = any>(vorpal: CommandInstance, path: string, data?: any, update?: boolean) => Promise<T>;
 export declare const getProjectInfo: (vorpal: CommandInstance) => Promise<{
     id: string;
     web_url: string;
@@ -14,4 +14,5 @@ declare type GitlabVariable = {
     environment_scope: string;
 };
 export declare const getAllVariables: (vorpal: CommandInstance) => Promise<Array<GitlabVariable>>;
+export declare const upsertAllVariables: (vorpal: CommandInstance, variables: Record<string, string>, env: string, componentName: string) => Promise<void>;
 export {};

package/dist/utils/gitlab.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllVariables = exports.getProjectInfo = exports.doGitlabRequest = exports.getGitlabToken = void 0;
+exports.upsertAllVariables = exports.getAllVariables = exports.getProjectInfo = exports.doGitlabRequest = exports.getGitlabToken = void 0;
 const child_process_promise_1 = require("child-process-promise");
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const open_1 = __importDefault(require("open"));
@@ -38,10 +38,11 @@ const getGitlabToken = async (vorpal) => {
     return (0, preferences_1.getPreference)(TOKEN_KEY);
 };
 exports.getGitlabToken = getGitlabToken;
-const doGitlabRequest = async (vorpal, path, data) => {
+const doGitlabRequest = async (vorpal, path, data = undefined, update) => {
     const rootToken = await (0, exports.getGitlabToken)(vorpal);
+    const method = data ? (update ? "PUT" : "POST") : "GET";
     const result = await (0, node_fetch_1.default)(`https://git.panter.ch/api/v4/${path}`, {
-        method: data ? "POST" : "GET",
+        method,
         headers: {
             "Content-Type": "application/json",
             "Private-Token": rootToken,
@@ -66,4 +67,29 @@ const getAllVariables = async (vorpal) => {
     return await (0, exports.doGitlabRequest)(this, `projects/${id}/variables`);
 };
 exports.getAllVariables = getAllVariables;
+const createVariable = async (vorpal, projectId, key, value) => {
+    return await (0, exports.doGitlabRequest)(this, `projects/${projectId}/variables`, {
+        key,
+        value,
+    });
+};
+const updateVariable = async (vorpal, projectId, key, value) => {
+    return await (0, exports.doGitlabRequest)(this, `projects/${projectId}/variables/${key}`, {
+        value,
+    }, true);
+};
+const upsertAllVariables = async (vorpal, variables, env, componentName) => {
+    const { id } = await (0, exports.getProjectInfo)(vorpal);
+    console.log("upsertAllVariables", variables);
+    for (const [key, value] of Object.entries(variables ?? {})) {
+        const fullKey = "CL_" + env + "_" + componentName + "_" + key;
+        try {
+            await updateVariable(vorpal, id, fullKey, value);
+        }
+        catch (e) {
+            await createVariable(vorpal, id, fullKey, value);
+        }
+    }
+};
+exports.upsertAllVariables = upsertAllVariables;
 //# sourceMappingURL=gitlab.js.map

package/dist/utils/gitlab.js.map

@@ -1 +1 @@
-{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../src/utils/gitlab.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../src/utils/gitlab.ts"],"names":[],"mappings":"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"}

package/dist/utils/projects/index.d.ts

@@ -1,19 +1,8 @@
-import { Env, ISecrets, IValueFile } from "../../types/types";
 export declare const getGitRoot: () => Promise<any>;
 export declare const getRootGitlabCiFile: () => Promise<string>;
 export declare const readRootGitlabCiFile: () => Promise<any[]>;
 export declare const hasGitlabCiFile: () => Promise<boolean>;
-export declare const getProjectNamespace: (env: string) => Promise<string>;
-export declare const getProjectPods: (env: Env) => Promise<import("@kubernetes/client-node").V1Pod[]>;
-export declare const getProjectPvcs: (env: Env) => Promise<import("@kubernetes/client-node").V1PersistentVolumeClaim[]>;
-export declare const getProjectPodNames: (env: Env) => Promise<string[]>;
-export declare const getPassPath: (env: Env) => Promise<string>;
-export declare const getProjectValuesFiles: (env: Env, subApp?: string) => Promise<string[]>;
-export declare const getAllValues: (env: Env, subApp?: string) => Promise<IValueFile[]>;
-export declare const getProjectValues: (env: Env, subApp?: string) => Promise<IValueFile>;
-export declare const getAllPublicEnvVars: (env: Env, subApp?: string) => Promise<{}>;
-export declare const getAllSecretsEnvVarsMapping: (env: Env, subApp?: string) => Promise<ISecrets>;
-export declare const hasSecrets: (env: Env, subApp?: string) => Promise<boolean>;
-export declare const getAllEnvVars: (env: Env, subApp?: string) => Promise<Record<string, string>>;
-export declare const getAllSecretEnvVars: (env: Env, subApp?: string) => Promise<never>;
-export declare const getLocalProjectVariables: () => never;
+export declare const getProjectNamespace: (envComponent: string) => Promise<string>;
+export declare const getProjectPods: (envComponent: string) => Promise<import("@kubernetes/client-node").V1Pod[]>;
+export declare const getProjectPvcs: (envComponent: string) => Promise<import("@kubernetes/client-node").V1PersistentVolumeClaim[]>;
+export declare const getProjectPodNames: (envComponent: string) => Promise<string[]>;

package/dist/utils/projects/index.js

@@ -3,17 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLocalProjectVariables = exports.getAllSecretEnvVars = exports.getAllEnvVars = exports.hasSecrets = exports.getAllSecretsEnvVarsMapping = exports.getAllPublicEnvVars = exports.getProjectValues = exports.getAllValues = exports.getProjectValuesFiles = exports.getPassPath = exports.getProjectPodNames = exports.getProjectPvcs = exports.getProjectPods = exports.getProjectNamespace = exports.hasGitlabCiFile = exports.readRootGitlabCiFile = exports.getRootGitlabCiFile = exports.getGitRoot = void 0;
+exports.getProjectPodNames = exports.getProjectPvcs = exports.getProjectPods = exports.getProjectNamespace = exports.hasGitlabCiFile = exports.readRootGitlabCiFile = exports.getRootGitlabCiFile = exports.getGitRoot = void 0;
 const child_process_promise_1 = require("child-process-promise");
 const path_1 = require("path");
+const getProjectConfig_1 = require("../../config/getProjectConfig");
 const k8sApi_1 = __importDefault(require("../../k8sApi"));
 const files_1 = require("../files");
-const formatEnvVars_1 = __importDefault(require("../formatEnvVars"));
-const promise_1 = require("../promise");
-const lodash_1 = require("lodash");
-const getProjectConfig_1 = require("../../config/getProjectConfig");
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const YAWN = require("yawn-yaml/cjs");
 const getGitRoot = async () => {
     return (await (0, child_process_promise_1.exec)("git rev-parse --show-toplevel")).stdout?.trim();
 };
@@ -33,90 +28,27 @@ const hasGitlabCiFile = async () => {
     return true;
 };
 exports.hasGitlabCiFile = hasGitlabCiFile;
-const getProjectNamespace = async (env) => {
+const getProjectNamespace = async (envComponent) => {
+    const { env } = (0, getProjectConfig_1.parseChoice)(envComponent);
     const config = (0, getProjectConfig_1.getProjectConfig)();
     return `${config.customerName}-${config.appName}-${env}`;
 };
 exports.getProjectNamespace = getProjectNamespace;
-const getProjectPods = async (env) => {
-    const namespace = await (0, exports.getProjectNamespace)(env);
+const getProjectPods = async (envComponent) => {
+    const namespace = await (0, exports.getProjectNamespace)(envComponent);
     const res = await k8sApi_1.default.listNamespacedPod(namespace);
     return res.body.items;
 };
 exports.getProjectPods = getProjectPods;
-const getProjectPvcs = async (env) => {
-    const namespace = await (0, exports.getProjectNamespace)(env);
+const getProjectPvcs = async (envComponent) => {
+    const namespace = await (0, exports.getProjectNamespace)(envComponent);
     const res = await k8sApi_1.default.listNamespacedPersistentVolumeClaim(namespace);
     return res.body.items;
 };
 exports.getProjectPvcs = getProjectPvcs;
-const getProjectPodNames = async (env) => {
-    const pods = await (0, exports.getProjectPods)(env);
+const getProjectPodNames = async (envComponent) => {
+    const pods = await (0, exports.getProjectPods)(envComponent);
     return pods.map((n) => n.metadata.name);
 };
 exports.getProjectPodNames = getProjectPodNames;
-const getPassPath = async (env) => {
-    const { CUSTOMER_NAME, APP_NAME } = await (0, exports.getLocalProjectVariables)();
-    return `${CUSTOMER_NAME}/${APP_NAME}/${env}/secrets.yml`;
-};
-exports.getPassPath = getPassPath;
-const getProjectValuesFiles = async (env, subApp) => {
-    const gitRoot = await (0, exports.getGitRoot)();
-    const possibleFiles = ["values.yml", `values-${env}.yml`].map((file) => subApp ? (0, path_1.join)(gitRoot, subApp, file) : (0, path_1.join)(gitRoot, file));
-    return (0, promise_1.filter)(possibleFiles, async (file) => {
-        const [error] = await (0, files_1.readFileOrError)(file);
-        return !error;
-    });
-};
-exports.getProjectValuesFiles = getProjectValuesFiles;
-const getAllValues = async (env, subApp) => {
-    const valuesFilePaths = await (0, exports.getProjectValuesFiles)(env, subApp);
-    return Promise.all(valuesFilePaths.map(async (file) => (await (0, files_1.readYaml)(file))));
-};
-exports.getAllValues = getAllValues;
-const getProjectValues = async (env, subApp) => {
-    const values = await (0, exports.getAllValues)(env, subApp);
-    return (0, lodash_1.merge)({}, ...values);
-};
-exports.getProjectValues = getProjectValues;
-const getAllPublicEnvVars = async (env, subApp) => {
-    return (0, formatEnvVars_1.default)((await (0, exports.getAllValues)(env, subApp)).reduce((acc, value) => {
-        if (value.env && value.env.public) {
-            return {
-                ...acc,
-                ...value.env.public,
-            };
-        }
-        return acc;
-    }, {}));
-};
-exports.getAllPublicEnvVars = getAllPublicEnvVars;
-const getAllSecretsEnvVarsMapping = async (env, subApp) => {
-    return (await (0, exports.getAllValues)(env, subApp)).reduce((acc, value) => {
-        if (value.env && value.env.secret) {
-            return {
-                ...acc,
-                ...value.env.secret,
-            };
-        }
-        return acc;
-    }, {});
-};
-exports.getAllSecretsEnvVarsMapping = getAllSecretsEnvVarsMapping;
-const hasSecrets = async (env, subApp) => {
-    return Object.keys(await (0, exports.getAllSecretsEnvVarsMapping)(env, subApp)).length > 0;
-};
-exports.hasSecrets = hasSecrets;
-const getAllEnvVars = async (env, subApp) => {
-    throw new Error("needs to be re-implemented");
-};
-exports.getAllEnvVars = getAllEnvVars;
-const getAllSecretEnvVars = async (env, subApp) => {
-    throw new Error("needs to be re-implemented");
-};
-exports.getAllSecretEnvVars = getAllSecretEnvVars;
-const getLocalProjectVariables = () => {
-    throw new Error("use getProjectConfig");
-};
-exports.getLocalProjectVariables = getLocalProjectVariables;
 //# sourceMappingURL=index.js.map

package/dist/utils/projects/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/projects/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/projects/index.ts"],"names":[],"mappings":";;;;;;AAAA,iEAA6C;AAC7C,+BAA4B;AAC5B,oEAA8E;AAC9E,0DAAkC;AAClC,oCAA2C;AAEpC,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;IACnC,OAAO,CAAC,MAAM,IAAA,4BAAI,EAAC,+BAA+B,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;AACtE,CAAC,CAAC;AAFW,QAAA,UAAU,cAErB;AAEK,MAAM,mBAAmB,GAAG,KAAK,IAAI,EAAE;IAC5C,MAAM,OAAO,GAAG,MAAM,IAAA,kBAAU,GAAE,CAAC;IACnC,OAAO,IAAA,WAAI,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;AACzC,CAAC,CAAC;AAHW,QAAA,mBAAmB,uBAG9B;AAEK,MAAM,oBAAoB,GAAG,KAAK,IAAI,EAAE,CAC7C,IAAA,uBAAe,EAAC,MAAM,IAAA,2BAAmB,GAAE,CAAC,CAAC;AADlC,QAAA,oBAAoB,wBACc;AAExC,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;IACxC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,IAAA,4BAAoB,GAAE,CAAC;IACnD,IAAI,KAAK,EAAE;QACT,OAAO,KAAK,CAAC;KACd;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AANW,QAAA,eAAe,mBAM1B;AAEK,MAAM,mBAAmB,GAAG,KAAK,EAAE,YAAoB,EAAE,EAAE;IAChE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,8BAAW,EAAC,YAAY,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAA,mCAAgB,GAAE,CAAC;IAClC,OAAO,GAAG,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,OAAO,IAAI,GAAG,EAAE,CAAC;AAC3D,CAAC,CAAC;AAJW,QAAA,mBAAmB,uBAI9B;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,YAAoB,EAAE,EAAE;IAC3D,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAmB,EAAC,YAAY,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,MAAM,gBAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAEtD,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;AACxB,CAAC,CAAC;AALW,QAAA,cAAc,kBAKzB;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,YAAoB,EAAE,EAAE;IAC3D,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAmB,EAAC,YAAY,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,MAAM,gBAAM,CAAC,mCAAmC,CAAC,SAAS,CAAC,CAAC;IAExE,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;AACxB,CAAC,CAAC;AALW,QAAA,cAAc,kBAKzB;AAEK,MAAM,kBAAkB,GAAG,KAAK,EAAE,YAAoB,EAAE,EAAE;IAC/D,MAAM,IAAI,GAAG,MAAM,IAAA,sBAAc,EAAC,YAAY,CAAC,CAAC;IAChD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC1C,CAAC,CAAC;AAHW,QAAA,kBAAkB,sBAG7B"}

package/package.json

@@ -61,5 +61,5 @@
     "@typescript-eslint/parser": "^5.8.0",
     "typescript": "^4.5.4"
   },
-  "version": "0.0.0-main-3b6d4049"
+  "version": "0.0.0-main-5f142cf2"
 }

package/src/apps/catenv/catenv.ts

@@ -1,36 +1,46 @@
-import { getAllEnvVars } from "../../utils/projects";
-import {
-  getCurrentSubApp,
-  getSubAppsInMonoRepo,
-} from "../shell/commands/project/utils/monorepo";
+import { ComponentConfig } from "@catladder/pipeline";
+import { getEnvVars, getProjectConfig } from "../../config/getProjectConfig";
+import { getGitRoot } from "../../utils/projects";
+import { join } from "path";
+const getCurrentComponentName = async (
+  components: Record<string, ComponentConfig>
+) => {
+  const gitRoot = await getGitRoot();
+  const currentDir = process.cwd();
+  return Object.keys(components).find((c) =>
+    currentDir.startsWith(join(gitRoot, components[c].dir))
+  );
+};
 
 const sanitizeEnvVarName = (name: string) => name.replace(/[\s\-.]+/g, "_");
 export default async () => {
-  const subapps = await getSubAppsInMonoRepo();
-  const currentSubApp = await getCurrentSubApp();
+  const { components } = getProjectConfig();
+
+  const currentComponent = await getCurrentComponentName(components);
   let variables = {};
-  if (currentSubApp) {
-    variables = await getAllEnvVars("dev-local", currentSubApp.componentName);
-  } else if (subapps.length > 0) {
+  if (currentComponent) {
+    variables = await getEnvVars(null, "dev-local:" + currentComponent);
+  } else {
     // when in a monorep and not in a subapp, merge all env vars.
     // this is not 100% correct, but better than not exporting any vars at all
     // so we also add prefixed variants
-    variables = await subapps.reduce(async (acc, subapp) => {
-      const subappvars = await getAllEnvVars("dev-local", subapp.componentName);
-      return {
-        ...(await acc),
-        ...subappvars,
-        // also add prefixed variants in case
-        ...Object.fromEntries(
-          Object.entries(subappvars).map(([key, value]) => [
-            `${sanitizeEnvVarName(subapp.componentName.toUpperCase())}_${key}`,
-            value,
-          ])
-        ),
-      };
-    }, {});
-  } else {
-    variables = await getAllEnvVars("dev-local");
+    variables = await Object.keys(components).reduce(
+      async (acc, componentName) => {
+        const subappvars = await getEnvVars(null, "dev-local:" + componentName);
+        return {
+          ...(await acc),
+          ...subappvars,
+          // also add prefixed variants in case
+          ...Object.fromEntries(
+            Object.entries(subappvars).map(([key, value]) => [
+              `${sanitizeEnvVarName(componentName.toUpperCase())}_${key}`,
+              value,
+            ])
+          ),
+        };
+      },
+      {}
+    );
   }
 
   console.log(

package/src/apps/shell/commands/mongodb/projectMongoDestroyMember.ts

@@ -37,12 +37,12 @@ const removeFinalizerAndDelete = async (
 export default (vorpal: Vorpal) =>
   vorpal
     .command(
-      "project-mongo-destroy-member <env>",
+      "project-mongo-destroy-member <envComponent>",
       "DESTROY a member of a replicaset in order to reinitialize it"
     )
     .autocomplete(envAutocompletion)
-    .action(async function ({ env }) {
-      await ensureCluster.call(this);
+    .action(async function ({ envComponent }) {
+      await ensureCluster.call(this, envComponent);
       this.log(
         "this command tries to delete a (secondary) member of the replicaset, it's persistent volume claim (pvc) and the volume"
       );
@@ -74,10 +74,10 @@ export default (vorpal: Vorpal) =>
         throw new Error("abort");
       }
 
-      const namespace = await getProjectNamespace(env);
-      const mongodbPods = await getMongoDbPodsWithReplInfo(env);
+      const namespace = await getProjectNamespace(envComponent);
+      const mongodbPods = await getMongoDbPodsWithReplInfo(envComponent);
 
-      const pvcs = await getProjectPvcs(env);
+      const pvcs = await getProjectPvcs(envComponent);
       const secondaries = mongodbPods.filter((pod) => !pod.isMaster);
 
       if (secondaries.length === 0) {

package/src/apps/shell/commands/mongodb/projectMongoGetShell.ts

@@ -5,20 +5,22 @@ import { envAutocompletion } from "../project/utils/autocompletions";
 import ensureCluster from "../project/utils/ensureCluster";
 import {
   getMongodbShell,
-  getProjectMongodbAllPodsSortedWithLabel
+  getProjectMongodbAllPodsSortedWithLabel,
 } from "./utils";
 
 export default (vorpal: Vorpal) =>
   vorpal
     .command(
-      "project-mongo-get-shell <env>",
+      "project-mongo-get-shell <envComponent>",
       "get a shell to a mongodb in the environment"
     )
     .autocomplete(envAutocompletion)
-    .action(async function({ env }) {
-      await ensureCluster.call(this);
-      const namespace = await getProjectNamespace(env);
-      const podNames = await getProjectMongodbAllPodsSortedWithLabel(env);
+    .action(async function ({ envComponent }) {
+      await ensureCluster.call(this, envComponent);
+      const namespace = await getProjectNamespace(envComponent);
+      const podNames = await getProjectMongodbAllPodsSortedWithLabel(
+        envComponent
+      );
       if (podNames.length === 0) {
         logError(this, "sorry, no pods found");
         return;
@@ -32,7 +34,7 @@ export default (vorpal: Vorpal) =>
             type: "list",
             name: "podName",
             choices: podNames,
-            message: "Which pod? 🤔"
+            message: "Which pod? 🤔",
           })
         ).podName;
       }

package/src/apps/shell/commands/mongodb/projectMongoPortForward.ts

@@ -8,12 +8,17 @@ import { getProjectMongodbAllPodsSortedWithLabel } from "./utils";
 
 export default (vorpal: Vorpal) =>
   vorpal
-    .command("project-mongo-port-forward <env>", "port foward to a mongodb")
+    .command(
+      "project-mongo-port-forward <envComponent>",
+      "port foward to a mongodb"
+    )
     .autocomplete(envAutocompletion)
-    .action(async function ({ env }) {
-      await ensureCluster.call(this);
-      const namespace = await getProjectNamespace(env);
-      const podNames = await getProjectMongodbAllPodsSortedWithLabel(env);
+    .action(async function ({ envComponent }) {
+      await ensureCluster.call(this, envComponent);
+      const namespace = await getProjectNamespace(envComponent);
+      const podNames = await getProjectMongodbAllPodsSortedWithLabel(
+        envComponent
+      );
       if (podNames.length === 0) {
         logError(this, "sorry, no pods found");
         return;

package/src/apps/shell/commands/mongodb/utils/index.ts

@@ -1,5 +1,4 @@
 import { exec, spawn } from "child-process-promise";
-import { Env } from "../../../../../types/types";
 import {
   getProjectNamespace,
   getProjectPodNames,
@@ -8,8 +7,8 @@ import {
 const filterMongoDbs = (podNames: string[]) =>
   podNames.filter((name) => name.includes("mongodb-replicaset"));
 
-export const getProjectMongodbAllPods = async (env: Env) =>
-  filterMongoDbs(await getProjectPodNames(env));
+export const getProjectMongodbAllPods = async (envComponent: string) =>
+  filterMongoDbs(await getProjectPodNames(envComponent));
 
 export const getMongodbShell = async (namespace: string, podName: string) => {
   const command = `kubectl exec -it ${podName} --namespace ${namespace} mongo`;
@@ -55,12 +54,12 @@ export const podIsMaster = async (namespace: string, podName: string) => {
 
 const spaces = (n: number) => " ".repeat(n);
 
-export const getMongoDbPodsWithReplInfo = async (env: Env) => {
-  const namespace = await getProjectNamespace(env);
+export const getMongoDbPodsWithReplInfo = async (envComponent: string) => {
+  const namespace = await getProjectNamespace(envComponent);
   return (
     await Promise.all(
       (
-        await getProjectMongodbAllPods(env)
+        await getProjectMongodbAllPods(envComponent)
       ).map(async (podName) => ({
         podName,
         componentName: podName.replace(/-mongodb-replicaset-[0-9]+/, ""),
@@ -70,8 +69,10 @@ export const getMongoDbPodsWithReplInfo = async (env: Env) => {
   ).sort((podA, podB) => (podA.isMaster ? (podB.isMaster ? 0 : -1) : 1));
 };
 
-export const getProjectMongodbAllPodsSortedWithLabel = async (env: Env) => {
-  const pods = await getMongoDbPodsWithReplInfo(env);
+export const getProjectMongodbAllPodsSortedWithLabel = async (
+  envComponent: string
+) => {
+  const pods = await getMongoDbPodsWithReplInfo(envComponent);
   const maxComponentNameLength = Math.max(
     ...pods.map((c) => c.componentName.length)
   );

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

@@ -1,3 +1,4 @@
+import { isOfDeployType } from "@catladder/pipeline";
 import { spawn } from "child-process-promise";
 import { writeFile } from "fs-extra";
 import { withFile } from "tmp-promise";
@@ -8,17 +9,19 @@ import {
 } from "../../../../config/constants";
 import {
   getEnvComponentChoices,
+  getEnvVars,
+  getPipelineContextByChoice,
   getProjectConfig,
+  parseChoice,
 } from "../../../../config/getProjectConfig";
 import { readPass } from "../../../../utils/passwordstore";
-import { getAllEnvVars, getProjectValues } from "../../../../utils/projects";
 
 export default (vorpal: Vorpal) =>
   vorpal
-    .command("project-cloud-sql-proxy <appEnv>", "proxy to cloud sql db")
+    .command("project-cloud-sql-proxy <envComponent>", "proxy to cloud sql db")
     .autocomplete(getEnvComponentChoices())
-    .action(async function ({ appEnv }) {
-      const [componentName, env] = appEnv.split("-");
+    .action(async function ({ envComponent }) {
+      const { env } = parseChoice(envComponent);
 
       const config = getProjectConfig();
       // skynet-164509:europe-west6:pvl-cyclomania-review=tcp:5432
@@ -30,14 +33,18 @@ export default (vorpal: Vorpal) =>
         message: "Local port: ",
       });
 
-      const POSTGRESQL_PASSWORD = (await getAllEnvVars(env, componentName))
+      const POSTGRESQL_PASSWORD = (await getEnvVars(this, envComponent))
         ?.POSTGRESQL_PASSWORD;
 
-      const values = await getProjectValues(env, componentName);
-      this.log("");
+      const context = await getPipelineContextByChoice(envComponent);
+      if (!isOfDeployType(context.componentConfig.deploy, "kubernetes")) {
+        throw new Error("currently only supported for kubernetes deployment");
+      }
       this.log(`postgres-PW: ${POSTGRESQL_PASSWORD}`);
       this.log("");
 
+      const values = context.componentConfig.deploy.values;
+
       const projectId = values?.cloudsql?.projectId || GOOGLE_PROJECT;
 
       const defaultInstanceId = `${config.customerName}-${config.appName}-${env}`;