@catladder/cli 0.0.0-node16-ddfae617 → 0.0.0-pipeline-variables-ed2d2565

package/dist/utils/projects/index.js

@@ -1,8 +1,4 @@
 "use strict";
-var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
-    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
-    return cooked;
-};
 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) {
@@ -40,16 +36,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 exports.__esModule = true;
-exports.getProjectPodNames = exports.getProjectPvcs = exports.getProjectPods = exports.getProjectNamespace = exports.hasGitlabCiFile = exports.readRootGitlabCiFile = exports.getRootGitlabCiFile = exports.getGitRoot = void 0;
-var zx_1 = require("zx");
+exports.getProjectNamespace = exports.hasGitlabCiFile = exports.readRootGitlabCiFile = exports.getRootGitlabCiFile = exports.getGitRoot = void 0;
 var path_1 = require("path");
 var getProjectConfig_1 = require("../../config/getProjectConfig");
-var k8sApi_1 = require("../../k8sApi");
 var files_1 = require("../files");
+var child_process_promise_1 = require("child-process-promise");
 var getGitRoot = function () { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, zx_1.$)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["git rev-parse --show-toplevel"], ["git rev-parse --show-toplevel"])))];
+            case 0: return [4 /*yield*/, (0, child_process_promise_1.exec)("git rev-parse --show-toplevel")];
             case 1: return [2 /*return*/, (_a.sent()).stdout.trim()];
         }
     });
@@ -105,49 +100,4 @@ var getProjectNamespace = function (envComponent) { return __awaiter(void 0, voi
     });
 }); };
 exports.getProjectNamespace = getProjectNamespace;
-var getProjectPods = function (envComponent) { return __awaiter(void 0, void 0, void 0, function () {
-    var namespace, k8sApi, res;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.getProjectNamespace)(envComponent)];
-            case 1:
-                namespace = _a.sent();
-                k8sApi = (0, k8sApi_1.getk8sApi)();
-                return [4 /*yield*/, k8sApi.listNamespacedPod(namespace)];
-            case 2:
-                res = _a.sent();
-                return [2 /*return*/, res.body.items];
-        }
-    });
-}); };
-exports.getProjectPods = getProjectPods;
-var getProjectPvcs = function (envComponent) { return __awaiter(void 0, void 0, void 0, function () {
-    var namespace, k8sApi, res;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.getProjectNamespace)(envComponent)];
-            case 1:
-                namespace = _a.sent();
-                k8sApi = (0, k8sApi_1.getk8sApi)();
-                return [4 /*yield*/, k8sApi.listNamespacedPersistentVolumeClaim(namespace)];
-            case 2:
-                res = _a.sent();
-                return [2 /*return*/, res.body.items];
-        }
-    });
-}); };
-exports.getProjectPvcs = getProjectPvcs;
-var getProjectPodNames = function (envComponent) { return __awaiter(void 0, void 0, void 0, function () {
-    var pods;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.getProjectPods)(envComponent)];
-            case 1:
-                pods = _a.sent();
-                return [2 /*return*/, pods.map(function (n) { return n.metadata.name; })];
-        }
-    });
-}); };
-exports.getProjectPodNames = getProjectPodNames;
-var templateObject_1;
 //# 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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAuB;AACvB,6BAA4B;AAC5B,kEAA8E;AAC9E,uCAAyC;AACzC,kCAA2C;AAEpC,IAAM,UAAU,GAAG;;;oBAChB,yBAAM,MAAC,mGAAA,+BAA+B,MAAA;oBAA9C,sBAAO,CAAC,SAAsC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAC;;;KAC/D,CAAC;AAFW,QAAA,UAAU,cAErB;AAEK,IAAM,mBAAmB,GAAG;;;;oBACjB,qBAAM,IAAA,kBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;gBAClC,sBAAO,IAAA,WAAI,EAAC,OAAO,EAAE,gBAAgB,CAAC,EAAC;;;KACxC,CAAC;AAHW,QAAA,mBAAmB,uBAG9B;AAEK,IAAM,oBAAoB,GAAG;;;YAClC,KAAA,uBAAe,CAAA;YAAC,qBAAM,IAAA,2BAAmB,GAAE,EAAA;gBAA3C,sBAAA,kBAAgB,SAA2B,EAAC,EAAA;;SAAA,CAAC;AADlC,QAAA,oBAAoB,wBACc;AAExC,IAAM,eAAe,GAAG;;;;oBACP,qBAAM,IAAA,4BAAoB,GAAE,EAAA;;gBAA5C,KAAgB,SAA4B,EAA3C,KAAK,QAAA,EAAE,IAAI,QAAA;gBAClB,IAAI,KAAK,EAAE;oBACT,sBAAO,KAAK,EAAC;iBACd;gBACD,sBAAO,IAAI,EAAC;;;KACb,CAAC;AANW,QAAA,eAAe,mBAM1B;AAEK,IAAM,mBAAmB,GAAG,UAAO,YAAoB;;;;;gBACpD,GAAG,GAAK,IAAA,8BAAW,EAAC,YAAY,CAAC,IAA9B,CAA+B;gBAC3B,qBAAM,IAAA,mCAAgB,GAAE,EAAA;;gBAAjC,MAAM,GAAG,SAAwB;gBACvC,sBAAO,UAAG,MAAM,CAAC,YAAY,cAAI,MAAM,CAAC,OAAO,cAAI,GAAG,CAAE,EAAC;;;KAC1D,CAAC;AAJW,QAAA,mBAAmB,uBAI9B;AAEK,IAAM,cAAc,GAAG,UAAO,YAAoB;;;;oBACrC,qBAAM,IAAA,2BAAmB,EAAC,YAAY,CAAC,EAAA;;gBAAnD,SAAS,GAAG,SAAuC;gBACnD,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;gBACf,qBAAM,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAA;;gBAA/C,GAAG,GAAG,SAAyC;gBAErD,sBAAO,GAAG,CAAC,IAAI,CAAC,KAAK,EAAC;;;KACvB,CAAC;AANW,QAAA,cAAc,kBAMzB;AAEK,IAAM,cAAc,GAAG,UAAO,YAAoB;;;;oBACrC,qBAAM,IAAA,2BAAmB,EAAC,YAAY,CAAC,EAAA;;gBAAnD,SAAS,GAAG,SAAuC;gBACnD,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;gBACf,qBAAM,MAAM,CAAC,mCAAmC,CAAC,SAAS,CAAC,EAAA;;gBAAjE,GAAG,GAAG,SAA2D;gBAEvE,sBAAO,GAAG,CAAC,IAAI,CAAC,KAAK,EAAC;;;KACvB,CAAC;AANW,QAAA,cAAc,kBAMzB;AAEK,IAAM,kBAAkB,GAAG,UAAO,YAAoB;;;;oBAC9C,qBAAM,IAAA,sBAAc,EAAC,YAAY,CAAC,EAAA;;gBAAzC,IAAI,GAAG,SAAkC;gBAC/C,sBAAO,IAAI,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAf,CAAe,CAAC,EAAC;;;KACzC,CAAC;AAHW,QAAA,kBAAkB,sBAG7B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/projects/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,kEAA8E;AAE9E,kCAA2C;AAC3C,+DAA6C;AAEtC,IAAM,UAAU,GAAG;;;oBAChB,qBAAM,IAAA,4BAAI,EAAC,+BAA+B,CAAC,EAAA;oBAAnD,sBAAO,CAAC,SAA2C,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAC;;;KACpE,CAAC;AAFW,QAAA,UAAU,cAErB;AAEK,IAAM,mBAAmB,GAAG;;;;oBACjB,qBAAM,IAAA,kBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;gBAClC,sBAAO,IAAA,WAAI,EAAC,OAAO,EAAE,gBAAgB,CAAC,EAAC;;;KACxC,CAAC;AAHW,QAAA,mBAAmB,uBAG9B;AAEK,IAAM,oBAAoB,GAAG;;;YAClC,KAAA,uBAAe,CAAA;YAAC,qBAAM,IAAA,2BAAmB,GAAE,EAAA;gBAA3C,sBAAA,kBAAgB,SAA2B,EAAC,EAAA;;SAAA,CAAC;AADlC,QAAA,oBAAoB,wBACc;AAExC,IAAM,eAAe,GAAG;;;;oBACP,qBAAM,IAAA,4BAAoB,GAAE,EAAA;;gBAA5C,KAAgB,SAA4B,EAA3C,KAAK,QAAA,EAAE,IAAI,QAAA;gBAClB,IAAI,KAAK,EAAE;oBACT,sBAAO,KAAK,EAAC;iBACd;gBACD,sBAAO,IAAI,EAAC;;;KACb,CAAC;AANW,QAAA,eAAe,mBAM1B;AAEK,IAAM,mBAAmB,GAAG,UAAO,YAAoB;;;;;gBACpD,GAAG,GAAK,IAAA,8BAAW,EAAC,YAAY,CAAC,IAA9B,CAA+B;gBAC3B,qBAAM,IAAA,mCAAgB,GAAE,EAAA;;gBAAjC,MAAM,GAAG,SAAwB;gBACvC,sBAAO,UAAG,MAAM,CAAC,YAAY,cAAI,MAAM,CAAC,OAAO,cAAI,GAAG,CAAE,EAAC;;;KAC1D,CAAC;AAJW,QAAA,mBAAmB,uBAI9B"}

package/package.json

@@ -8,7 +8,9 @@
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
     "test": "yarn run lint",
-    "build": "yarn tsc",
+    "build": "yarn build:compile && yarn build:bundle",
+    "build:bundle": "./scripts/bundle",
+    "build:compile": "yarn tsc",
     "build:watch": "yarn tsc -w"
   },
   "bin": {
@@ -16,34 +18,19 @@
     "catladder": "./bin/catladder"
   },
   "dependencies": {
-    "@catladder/pipeline": "0.0.0-node16-ddfae617",
-    "@kubernetes/client-node": "^0.16.2",
-    "child-process-promise": "^2.2.1",
-    "command-exists-promise": "^2.0.2",
-    "common-tags": "^1.8.0",
-    "dayjs": "^1.10.4",
-    "fs-extra": "^7.0.1",
-    "gitlab": "^4.4.1",
-    "js-yaml": "^4.1.0",
-    "lodash": "^4.17.21",
-    "memoizee": "^0.4.14",
-    "node-fetch": "^2.3.0",
-    "open": "^8.4.0",
-    "prettier": "^2.5.1",
-    "tmp-promise": "^2.0.2",
-    "update-notifier": "^2.5.0",
-    "vorpal": "^1.12.0",
-    "zx": "^4.3.0"
+    "ts-node": "^10.9.1"
   },
   "engines": {
     "node": ">=12.0.0"
   },
   "devDependencies": {
+    "@catladder/pipeline": "0.0.0-pipeline-variables-ed2d2565",
+    "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",
     "@types/fs-extra": "^5.0.4",
     "@types/js-yaml": "^4.0.5",
-    "@types/lodash": "^4.14.119",
+    "@types/lodash": "^4.14.185",
     "@types/memoizee": "^0.4.2",
     "@types/node-fetch": "^2.1.4",
     "@types/request": "^2.48.1",
@@ -52,9 +39,24 @@
     "@types/vorpal": "^1.12.0",
     "@types/websocket": "^0.0.40",
     "@types/yargs": "^13.0.0",
+    "child-process-promise": "^2.2.1",
+    "clipboardy": "^2.0.0",
+    "command-exists-promise": "^2.0.2",
+    "common-tags": "^1.8.0",
+    "dayjs": "^1.10.4",
     "eslint": "^8.7.0",
-    "typescript": "^4.5.4"
+    "fs-extra": "^7.0.1",
+    "gitlab": "^4.4.1",
+    "js-yaml": "^4.1.0",
+    "lodash": "^4.17.21",
+    "memoizee": "^0.4.14",
+    "node-fetch": "^2.3.0",
+    "open": "^8.4.0",
+    "prettier": "^2.5.1",
+    "tmp-promise": "^2.0.2",
+    "typescript": "^4.5.4",
+    "vorpal": "^1.12.0"
   },
-  "version": "0.0.0-node16-ddfae617",
+  "version": "0.0.0-pipeline-variables-ed2d2565",
   "stableVersion": "0.0.0"
 }

package/scripts/bundle

@@ -0,0 +1,4 @@
+#!/bin/bash
+ncc build dist/catenv.js -o dist/bundles/catenv -e 'ts-node' $( ((SHOULD_MINIFY == 1)) && printf %s '-m')
+
+ncc build dist/cli.js -o dist/bundles/cli -e 'ts-node' $( ((SHOULD_MINIFY == 1)) && printf %s '-m')

package/src/apps/catenv/catenv.ts

@@ -1,62 +1,18 @@
-import { Config, 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, "_");
-
-const getAllVariablesToPrint = async (config: Config) => {
-  const { components } = config;
-
-  const currentComponent = await getCurrentComponentName(components);
+import { getProjectConfig } from "../../config/getProjectConfig";
+import { printVariables } from "./printVariables";
+import type { Choice } from "./types";
+import { writeDotEnvFiles } from "./writeDotEnvFiles";
+import { writeDTsFiles } from "./writeEnvDTs";
 
-  let variables = {};
-  if (currentComponent) {
-    variables = await getEnvVars(null, "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 Object.keys(components).reduce(
-      async (acc, componentName) => {
-        const subappvars = await getEnvVars(null, "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,
-            ])
-          ),
-        };
-      },
-      {}
-    );
-  }
-  return variables;
-};
-export default async () => {
+export default async (choice?: Choice) => {
   const config = await getProjectConfig();
   if (!config) {
     return;
   }
 
-  const variables = await getAllVariablesToPrint(config);
+  await printVariables(config, choice);
+
+  await writeDotEnvFiles(config, choice);
 
-  console.log(
-    Object.entries(variables)
-      .map(([key, value]) => `export ${key}='${value}'`)
-      .join("\n")
-  );
+  await writeDTsFiles(config, choice);
 };

package/src/apps/catenv/printVariables.ts

@@ -0,0 +1,53 @@
+import type { Config } from "@catladder/pipeline";
+import { getEnvVarsResolved } from "../../config/getProjectConfig";
+import type { Choice, Variables } from "./types";
+import {
+  getCurrentComponentAndEnvFromChoice,
+  makeKeyValueString,
+  sanitizeEnvVarName,
+} from "./utils";
+
+const getAllVariablesToPrint = async (config: Config, choice?: Choice) => {
+  const { env, currentComponent } = await getCurrentComponentAndEnvFromChoice(
+    config,
+    choice
+  );
+
+  let variables: Record<string, string> = {};
+  if (currentComponent) {
+    variables = await getEnvVarsResolved(null, env, 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 Object.keys(config.components).reduce(
+      async (acc, componentName) => {
+        const subappvars = await getEnvVarsResolved(null, env, componentName);
+        delete subappvars["_ALL_ENV_VAR_KEYS"];
+        return {
+          ...(await acc),
+          ...subappvars,
+          // also add prefixed variants in case
+          ...Object.fromEntries(
+            Object.entries(subappvars).map(([key, value]) => [
+              `${sanitizeEnvVarName(componentName.toUpperCase())}_${key}`,
+              value,
+            ])
+          ),
+        };
+      },
+      {}
+    );
+  }
+
+  return variables;
+};
+
+export const printVariables = async (config: Config, choice?: Choice) => {
+  const variables = await getAllVariablesToPrint(config, choice);
+
+  console.log(makeExportKeyValuestring(variables));
+};
+
+const makeExportKeyValuestring = (variables: Variables) =>
+  makeKeyValueString(variables, "export ");

package/src/apps/catenv/types.ts

@@ -0,0 +1,6 @@
+export type Choice = {
+  env?: string;
+  componentName?: string;
+};
+
+export type Variables = Record<string, string>;

package/src/apps/catenv/utils.ts

@@ -0,0 +1,49 @@
+import type { Config } from "@catladder/pipeline";
+import { join } from "path";
+import { getGitRoot } from "../../utils/projects";
+import type { Choice, Variables } from "./types";
+export const getComponentFullPath = (
+  gitRoot: string,
+  config: Config,
+  componentName: string
+) => {
+  return join(gitRoot, config.components[componentName].dir);
+};
+const getCurrentComponentName = async (config: Config) => {
+  const gitRoot = await getGitRoot();
+  const currentDir = process.cwd();
+  return Object.keys(config.components).find((c) =>
+    currentDir.startsWith(getComponentFullPath(gitRoot, config, c))
+  );
+};
+
+export const getCurrentComponentAndEnvFromChoice = async (
+  config: Config,
+  choice?: Choice
+) => {
+  const env = choice?.env ?? "local";
+  const currentComponent =
+    choice?.componentName ?? (await getCurrentComponentName(config));
+
+  return {
+    currentComponent,
+    env,
+  };
+};
+
+export const makeKeyValueString = (variables: Variables, keyPrefix = "") =>
+  Object.entries(variables)
+    .map(([key, value]) => `${keyPrefix}${key}='${value}'`)
+    .join("\n");
+
+export const sanitizeMultiLine = (variables: Variables) => {
+  return Object.fromEntries(
+    Object.entries(variables).map(([key, value]) => [
+      key,
+      value.replaceAll("\n", "\\n"),
+    ])
+  );
+};
+
+export const sanitizeEnvVarName = (name: string) =>
+  name.replace(/[\s\-.]+/g, "_");

package/src/apps/catenv/writeDotEnvFiles.ts

@@ -0,0 +1,46 @@
+import type { Config } from "@catladder/pipeline";
+import { writeFile } from "fs-extra";
+import { join } from "path";
+import { getEnvVarsResolved } from "../../config/getProjectConfig";
+import { getGitRoot } from "../../utils/projects";
+import type { Choice } from "./types";
+import {
+  getComponentFullPath,
+  getCurrentComponentAndEnvFromChoice,
+  makeKeyValueString,
+  sanitizeMultiLine,
+} from "./utils";
+
+export const writeDotEnvFiles = async (config: Config, choice?: Choice) => {
+  const { env, currentComponent } = await getCurrentComponentAndEnvFromChoice(
+    config,
+    choice
+  );
+
+  // whether to print .dotenv is currentl configure on the "local" part of the env
+
+  const componentsWithEnabledDotEnvWrite = Object.entries(config.components)
+    .filter(([, component]) => component?.dotEnv)
+    .map(([componentName]) => componentName);
+
+  const componentsToActuallyWriteDotEnvNow = currentComponent
+    ? componentsWithEnabledDotEnvWrite.includes(currentComponent)
+      ? [currentComponent]
+      : []
+    : componentsWithEnabledDotEnvWrite;
+  const gitRoot = await getGitRoot();
+
+  for (const componentName of componentsToActuallyWriteDotEnvNow) {
+    const variables = await getEnvVarsResolved(null, env, componentName);
+    delete variables["_ALL_ENV_VAR_KEYS"];
+    const componentDir = getComponentFullPath(gitRoot, config, componentName);
+    const filePath = join(componentDir, ".env");
+    // many .dotenv don't like multiline values, so we sanitize them here
+    const variablesSanitized = sanitizeMultiLine(variables);
+    await writeFile(
+      filePath,
+      "# automatically created by catladder. Do not modify!\n\n" +
+        makeKeyValueString(variablesSanitized)
+    );
+  }
+};

package/src/apps/catenv/writeEnvDTs.ts

@@ -0,0 +1,71 @@
+import type { Config } from "@catladder/pipeline";
+import { writeFile } from "fs-extra";
+import { join } from "path";
+import { getEnvironment } from "../../config/getProjectConfig";
+import { getGitRoot } from "../../utils/projects";
+import type { Choice } from "./types";
+import {
+  getComponentFullPath,
+  getCurrentComponentAndEnvFromChoice,
+} from "./utils";
+
+export const writeDTsFiles = async (config: Config, choice?: Choice) => {
+  const { env, currentComponent } = await getCurrentComponentAndEnvFromChoice(
+    config,
+    choice
+  );
+
+  const componentsWithEnabledEnvDTsWrite = Object.entries(config.components)
+    .filter(([, component]) => component?.envDTs)
+    .map(([componentName]) => componentName);
+
+  const componentsToActuallyWriteDotEnvNow = currentComponent
+    ? componentsWithEnabledEnvDTsWrite.includes(currentComponent)
+      ? [currentComponent]
+      : []
+    : componentsWithEnabledEnvDTsWrite;
+  const gitRoot = await getGitRoot();
+
+  for (const componentName of componentsToActuallyWriteDotEnvNow) {
+    const envNames = await getEnvsForDTs(env, componentName);
+    const envDTsContent = createEnvDTsContent(envNames);
+
+    const componentDir = getComponentFullPath(gitRoot, config, componentName);
+    const filePath = join(componentDir, "env.d.ts");
+    await writeFile(filePath, envDTsContent);
+  }
+};
+
+async function getEnvsForDTs(
+  env: string,
+  componentName: string
+): Promise<string[]> {
+  const environment = await getEnvironment(env, componentName);
+  const allEnvKeys = Object.keys(environment.envVars);
+  const hiddenEnvKeys = new Set(
+    environment.secretEnvVarKeys
+      .filter((s) => s.hidden)
+      .map((s) => s.key)
+      .concat(["_ALL_ENV_VAR_KEYS"])
+  );
+  const dTsEnvKeys = allEnvKeys.filter((k) => !hiddenEnvKeys.has(k));
+
+  return dTsEnvKeys;
+}
+
+function createEnvDTsContent(envNames: string[]) {
+  return `/* tslint:disable prettier/prettier */
+/* eslint-disable prettier/prettier */
+/* prettier-ignore */
+// automatically generated by catladder. Do not modify!
+export {}
+
+declare global {
+  namespace NodeJS {
+    interface ProcessEnv {
+${envNames.map((name) => `      ${name}: string`).join("\n")}
+    }
+  }
+}
+`;
+}

package/src/apps/cli/cli.ts

@@ -1,9 +1,10 @@
 import Vorpal from "vorpal";
 // tslint:disable-next-line:no-var-requires
 import packageInfos from "../../packageInfos";
-import { stopAllPortForwards } from "../../utils/portForward";
+import { stopAllPortForwards } from "../../utils/portForwards";
 import general from "./commands/general";
 import mongodb from "./commands/mongodb";
+import cloudSQL from "./commands/cloudSQL";
 import project from "./commands/project";
 import theStuffThatReallyMatters from "./commands/theStuffThatReallyMatters";
 
@@ -29,6 +30,7 @@ export default async () => {
 
   general(vorpal);
   project(vorpal);
+  cloudSQL(vorpal);
   mongodb(vorpal);
   theStuffThatReallyMatters(vorpal);
 

package/src/apps/cli/commands/cloudSQL/commandRestoreDb.ts

@@ -0,0 +1,154 @@
+import { spawn } from "child-process-promise";
+
+import type Vorpal from "vorpal";
+import type { CloudSqlBackgroundProxy } from "../../../../gcloud/cloudSql/startProxy";
+import { startCloudSqlProxyInBackground } from "../../../../gcloud/cloudSql/startProxy";
+
+export default async (vorpal: Vorpal) =>
+  vorpal
+    .command(
+      "cloud-sql-restore-db",
+      "restore a db from one source to another target"
+    )
+    .action(async function restoreDb() {
+      const { sourceInstance } = await this.prompt({
+        type: "input",
+        name: "sourceInstance",
+
+        message: "Source instance (connection string or 'local')? 🤔 ",
+      });
+
+      let sourceProxy: CloudSqlBackgroundProxy;
+
+      let targetProxy: CloudSqlBackgroundProxy;
+
+      let sourcePort: number;
+      let targetPort: number;
+
+      if (sourceInstance === "local") {
+        const { sourceLocalPort } = await this.prompt({
+          type: "number",
+          name: "sourceLocalPort",
+          default: 5432,
+
+          message: "Local Port for source? 🤔 ",
+        });
+        sourcePort = sourceLocalPort;
+      } else {
+        sourcePort = 54399;
+        sourceProxy = await startCloudSqlProxyInBackground({
+          instanceName: sourceInstance,
+          localPort: sourcePort,
+        });
+      }
+
+      const { sourceUsername } = await this.prompt({
+        type: "input",
+        name: "sourceUsername",
+        default: "postgres",
+
+        message: "Source Username? 🤔 ",
+      });
+
+      const { sourcePassword } = await this.prompt({
+        type: "input",
+        name: "sourcePassword",
+
+        message: "Source Password? 🤔 ",
+      });
+
+      const { sourceDbName } = await this.prompt({
+        type: "input",
+        name: "sourceDbName",
+
+        message: "Source DB name? 🤔 ",
+      });
+
+      const { targetInstance } = await this.prompt({
+        type: "input",
+        name: "targetInstance",
+
+        message: "Target INSTANCE (connection string or 'local')? 🤔  ",
+      });
+
+      if (targetInstance === "local") {
+        const { targetLocalPort } = await this.prompt({
+          type: "number",
+          name: "targetLocalPort",
+          default: 5432,
+
+          message: "Local Port for target? 🤔 ",
+        });
+        targetPort = targetLocalPort;
+      } else {
+        targetPort = 54499;
+        targetProxy = await startCloudSqlProxyInBackground({
+          instanceName: targetInstance,
+          localPort: targetPort,
+        });
+      }
+
+      const { targetUsername } = await this.prompt({
+        type: "input",
+        name: "targetUsername",
+        default: "postgres",
+
+        message: "Target Username? 🤔 ",
+      });
+      const { targetPassword } = await this.prompt({
+        type: "input",
+        name: "targetPassword",
+
+        message: "Target Password? 🤔 ",
+      });
+
+      const { targetDbName } = await this.prompt({
+        type: "input",
+        name: "targetDbName",
+
+        message: "Target DB name? 🤔 ",
+      });
+
+      const { shouldContinue } = await this.prompt({
+        type: "confirm",
+        name: "shouldContinue",
+        message: `This will drop ${targetInstance}/${targetDbName} and replace it with ${sourceInstance}/${sourceDbName}. Continue? 🤔 `,
+      });
+
+      if (!shouldContinue) {
+        return;
+      }
+
+      const targetPSQL = (command: string) =>
+        `PGPASSWORD=${targetPassword} psql -p ${targetPort} --host=localhost --user=${targetUsername} -q ${command}`;
+
+      const copyDBScript = `
+      set -e
+     
+    
+
+      dumptmp=$(mktemp /tmp/dump.XXXXXX)
+
+      echo "Dumping file to $dumptmp"
+      pg_dump --dbname=postgres://${sourceUsername}:${sourcePassword}@localhost:${sourcePort}/${sourceDbName} --no-owner --no-privileges > $dumptmp
+      echo "dump done"
+      ${targetPSQL(
+        `-c 'drop database "${targetDbName}" WITH (FORCE)' 1> /dev/null || true`
+      )}
+      ${targetPSQL(`-c 'create database "${targetDbName}"' 1> /dev/null`)}
+          echo "Restoring dump..."
+      ${targetPSQL(`"${targetDbName}" < $dumptmp 1> /dev/null`)}
+  
+
+      echo "Clean up..."
+      set +e
+      rm $dumptmp
+      echo "\n🐱 Done!"
+      `;
+      try {
+        await spawn(copyDBScript, [], { shell: "bash", stdio: "inherit" });
+      } finally {
+        sourceProxy?.stop();
+        targetProxy?.stop();
+      }
+    });

package/src/apps/cli/commands/cloudSQL/index.ts

@@ -0,0 +1,8 @@
+import type Vorpal from "vorpal";
+//import commandInitProject from "./commandInitProject.old";
+
+import commandRestoreDb from "./commandRestoreDb";
+
+export default async (vorpal: Vorpal) => {
+  commandRestoreDb(vorpal);
+};