@catladder/cli 1.18.0 → 1.19.1

package/package.json

@@ -16,7 +16,7 @@
     "catladder": "./bin/catladder"
   },
   "dependencies": {
-    "@catladder/pipeline": "1.18.0",
+    "@catladder/pipeline": "1.19.1",
     "@kubernetes/client-node": "^0.16.2",
     "child-process-promise": "^2.2.1",
     "command-exists-promise": "^2.0.2",
@@ -55,5 +55,5 @@
     "eslint": "^8.7.0",
     "typescript": "^4.5.4"
   },
-  "version": "1.18.0"
+  "version": "1.19.1"
 }

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

@@ -152,22 +152,25 @@ const doItFor = async (
       if (hasBitwarden()) {
         // add cloud sql secret if needed.
         // TODO: this is legacy, in the future we want to have one service account per app
-
-        const context = await getPipelineContextByChoice(env, componentName);
-        if (
-          context.componentConfig.deploy &&
-          context.componentConfig.deploy.values?.cloudsql?.enabled
-        ) {
-          await upsertAllVariables(
-            instance,
-            {
-              cloudsqlProxyCredentials: await readPass(
-                GOOGLE_CLOUD_SQL_PASS_PATH
-              ),
-            },
-            env,
-            componentName
-          );
+        try {
+          const context = await getPipelineContextByChoice(env, componentName);
+          if (
+            context.componentConfig.deploy &&
+            context.componentConfig.deploy.values?.cloudsql?.enabled
+          ) {
+            await upsertAllVariables(
+              instance,
+              {
+                cloudsqlProxyCredentials: await readPass(
+                  GOOGLE_CLOUD_SQL_PASS_PATH
+                ),
+              },
+              env,
+              componentName
+            );
+          }
+        } catch (e) {
+          // ignore atm
         }
       }
       instance.log("✅ " + env + ":" + componentName);

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

@@ -24,10 +24,8 @@ import commandPortForward from "./commandPortForward";
 import commandTriggerCronjob from "./commandTriggerCronjob";
 
 import commandOpenGrafanaPod from "./commandOpenGrafanaPod";
-import commandReloadConfig from "./commandReloadConfig";
 
 export default async (vorpal: Vorpal) => {
-  commandReloadConfig(vorpal);
   commandSetup(vorpal);
 
   commandEnvVars(vorpal);

package/src/apps/cli/config/writeConfig.ts

@@ -4,7 +4,6 @@ import { writeFile } from "fs-extra";
 import { dump } from "js-yaml";
 import { format } from "prettier";
 import { CommandInstance } from "vorpal";
-import { reloadConfig } from "../../../config/getProjectConfig";
 import { getGitRoot } from "../../../utils/projects";
 
 export const writeConfig = async (
@@ -67,7 +66,6 @@ export const writeConfig = async (
     );
     await exec("git add " + file);
   }
-  await reloadConfig();
   vorpal.log("done!");
   vorpal.log("");
 };

package/src/catenv.ts

@@ -1,4 +1,7 @@
 import catenv from "./apps/catenv/catenv";
 import { $ } from "zx";
 $.verbose = false;
-catenv();
+catenv().then(() => {
+  // we have to exit manually, because we have some file watches
+  process.exit();
+});

package/src/config/getProjectConfig.ts

@@ -4,29 +4,41 @@ import {
   getEnvironment as _getEnvironment,
   createContext,
   getSecretVarName,
+  Config,
 } from "@catladder/pipeline";
 
-import { Command, CommandInstance } from "vorpal";
+import { CommandInstance } from "vorpal";
 import { getAllVariables, getVariableValueByRawName } from "../utils/gitlab";
-import memoizee from "memoizee";
+
 import { getGitRoot } from "../utils/projects";
 import { readYaml } from "../utils/files";
-// currently cant change
-
-export const getProjectConfig = memoizee(
-  async () => {
-    try {
-      const gitRoot = await getGitRoot();
-      return readConfigSync(gitRoot);
-    } catch (e) {
-      // ignore
-      return null;
-    }
-  },
-  { promise: true }
-);
-
-export const reloadConfig = () => getProjectConfig.clear();
+import { watch } from "fs";
+
+let currentConfig: Config = null;
+
+// reload the config on change
+const reloadConfigAndObserve = async () => {
+  const gitRoot = await getGitRoot();
+  const result = readConfigSync(gitRoot);
+  if (!result) {
+    // can't do anything, there is no config
+    return;
+  }
+  const { config, path } = result;
+  const watcher = watch(path, () => {
+    watcher.close();
+    reloadConfigAndObserve();
+  });
+  currentConfig = config;
+};
+
+export const getProjectConfig = async () => {
+  if (!currentConfig) {
+    // initially
+    await reloadConfigAndObserve();
+  }
+  return currentConfig;
+};
 
 export const getGitlabCiFilePath = async () => {
   const gitRoot = await getGitRoot();
@@ -99,6 +111,7 @@ export const getAllPipelineContexts = async () => {
 
 export const getEnvironment = async (env: string, componentName: string) => {
   const config = await getProjectConfig();
+
   return _getEnvironment(config, componentName, env);
 };
 

package/dist/apps/cli/commands/project/commandReloadConfig.d.ts

@@ -1,3 +0,0 @@
-import Vorpal from "vorpal";
-declare const _default: (vorpal: Vorpal) => Promise<Vorpal.Command>;
-export default _default;

package/dist/apps/cli/commands/project/commandReloadConfig.js

@@ -1,62 +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;
-var getProjectConfig_1 = require("../../../../config/getProjectConfig");
-var showProjectBanner_1 = require("./utils/showProjectBanner");
-exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        return [2 /*return*/, vorpal
-                .command("project-reload-config", "reloads the config")
-                .action(function () {
-                return __awaiter(this, void 0, void 0, function () {
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, (0, getProjectConfig_1.reloadConfig)()];
-                            case 1:
-                                _a.sent();
-                                return [4 /*yield*/, (0, showProjectBanner_1.showProjectBanner)(vorpal)];
-                            case 2:
-                                _a.sent();
-                                return [2 /*return*/];
-                        }
-                    });
-                });
-            })];
-    });
-}); });
-//# sourceMappingURL=commandReloadConfig.js.map

package/dist/apps/cli/commands/project/commandReloadConfig.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"commandReloadConfig.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandReloadConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wEAAmE;AACnE,+DAA8D;AAE9D,sBAAe,UAAO,MAAc;;QAClC,sBAAA,MAAM;iBACH,OAAO,CAAC,uBAAuB,EAAE,oBAAoB,CAAC;iBAEtD,MAAM,CAAC;;;;oCACN,qBAAM,IAAA,+BAAY,GAAE,EAAA;;gCAApB,SAAoB,CAAC;gCACrB,qBAAM,IAAA,qCAAiB,EAAC,MAAM,CAAC,EAAA;;gCAA/B,SAA+B,CAAC;;;;;aACjC,CAAC,EAAA;;KAAA,EAAC"}

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

@@ -1,12 +0,0 @@
-import Vorpal from "vorpal";
-import { reloadConfig } from "../../../../config/getProjectConfig";
-import { showProjectBanner } from "./utils/showProjectBanner";
-
-export default async (vorpal: Vorpal) =>
-  vorpal
-    .command("project-reload-config", "reloads the config")
-
-    .action(async function () {
-      await reloadConfig();
-      await showProjectBanner(vorpal);
-    });