@catladder/cli 0.0.0-fix-minor-catenv-command-fixes-78d05852 → 0.0.0-fix-cloud-run-memory-cpu-3ff798ea

package/package.json

@@ -52,7 +52,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-fix-minor-catenv-command-fixes-78d05852",
+  "version": "0.0.0-fix-cloud-run-memory-cpu-3ff798ea",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
@@ -74,7 +74,7 @@
     "ts-node": "^10.9.1"
   },
   "devDependencies": {
-    "@catladder/pipeline": "0.0.0-fix-minor-catenv-command-fixes-78d05852",
+    "@catladder/pipeline": "0.0.0-fix-cloud-run-memory-cpu-3ff798ea",
     "@gitbeaker/rest": "^39.28.0",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
@@ -105,7 +105,6 @@
     "node-fetch": "^2.3.0",
     "open": "^8.4.0",
     "prettier": "^2.5.1",
-    "prettier-plugin-sh": "^0.14.0",
     "tmp-promise": "^2.0.2",
     "ts-results-es": "^4.1.0-alpha.1",
     "typescript": "^4.5.4",

package/src/apps/catci/commands/security/topics.json

@@ -14,6 +14,11 @@
     "responsibles": 1,
     "more": ""
   },
+  {
+    "description": "No sensitive information (passwords, keys, user data, ...) is logged or traced",
+    "responsibles": 1,
+    "more": "[Logging guide](https://www.notion.so/panterch/Long-story-logging-022722bb878f4724ae5b49e17667b630?pvs=4#9e5a36b7158a4953b73ec6a345bd8989), [Tracing guide](https://www.notion.so/panterch/Long-story-tracing-d8a9ec1ac2ff4fa78cefa8991233224e?pvs=4#535121b5bf9741fbaf8654b4b64d879d)"
+  },
   {
     "description":
       "Passwords are stored hashed with salt and salt is not stored in the repository",

package/src/apps/catenv/catenv.ts

@@ -1,17 +1,15 @@
-import { getProjectConfig } from '../../config/getProjectConfig';
-import { parseChoiceArgument } from '../../config/parseChoiceArgument';
-import { printVariables } from './printVariables';
-import { writeDotEnvFiles } from './writeDotEnvFiles';
-import { writeDTsFiles } from './writeEnvDTs';
+import { getProjectConfig } from "../../config/getProjectConfig";
+import { printVariables } from "./printVariables";
+import type { Choice } from "./types";
+import { writeDotEnvFiles } from "./writeDotEnvFiles";
+import { writeDTsFiles } from "./writeEnvDTs";
 
-export default async () => {
+export default async (choice?: Choice) => {
   const config = await getProjectConfig();
   if (!config) {
     return;
   }
 
-  const choice = parseChoiceArgument(config);
-
   await printVariables(config, choice);
 
   await writeDotEnvFiles(config, choice);

package/src/apps/catenv/writeDotEnvFiles.ts

@@ -18,7 +18,7 @@ export const writeDotEnvFiles = async (config: Config, choice?: Choice) => {
   );
 
   const componentsWithEnabledDotEnvWrite = Object.entries(config.components)
-    .filter(([, component]) => component?.dotEnv)
+    .filter(([, component]) => component?.dotEnv) // when set to true or "local"
     .map(([componentName]) => componentName);
 
   const componentsToActuallyWriteDotEnvNow = currentComponent

package/src/catenv.ts

@@ -1,6 +1,10 @@
-import catenv from './apps/catenv/catenv';
+import catenv from "./apps/catenv/catenv";
 
-catenv().then(() => {
+import { parseChoice } from "./config/parseChoice";
+
+const choice = process.argv[2] ? parseChoice(process.argv[2]) : null;
+
+catenv(choice).then(() => {
   // we have to exit manually, because we have some file watches
   process.exit();
 });

package/dist/config/parseChoiceArgument.d.ts

@@ -1,13 +0,0 @@
-import type { Config, EnvType } from '@catladder/pipeline';
-import type { Choice } from '../apps/catenv/types';
-export declare const getEnvComponentArgument: () => {
-    env: EnvType;
-    componentName?: string | undefined;
-};
-/**
- * Parses the environment component argument and returns a Choice object.
- * @param envComponent - The environment component argument to parse.
- * @returns The parsed Choice object.
- * @throws Error if the env type is invalid.
- */
-export declare const parseChoiceArgument: ({ components }: Config) => Choice;

package/dist/config/parseChoiceArgument.js

@@ -1,43 +0,0 @@
-"use strict";
-exports.__esModule = true;
-exports.parseChoiceArgument = exports.getEnvComponentArgument = void 0;
-var pipeline_1 = require("@catladder/pipeline");
-var envTypes = Object.keys(pipeline_1.ENV_TYPES);
-var getEnvComponentArgument = function () {
-    var _a;
-    var componentMatch = "([a-zA-Z0-9_-]+)";
-    var argRegexp = new RegExp("^((".concat(envTypes.join('|'), "):").concat(componentMatch, "|").concat(componentMatch, ")$"));
-    var envComponent = (_a = process.argv[2]) !== null && _a !== void 0 ? _a : '';
-    var _b = argRegexp.exec(envComponent), _c = _b[2], env = _c === void 0 ? 'local' : _c, componentNameWithEnv = _b[3], onlyComponentName = _b[4];
-    if (!(0, pipeline_1.isKnowEnvType)(env)) {
-        throw new Error("invalid env type! ".concat(env, ".\nEnv must be one of: ").concat(envTypes.join(', ')));
-    }
-    if (componentNameWithEnv === null || componentNameWithEnv === void 0 ? void 0 : componentNameWithEnv.length) {
-        return { env: env, componentName: componentNameWithEnv };
-    }
-    if (onlyComponentName === null || onlyComponentName === void 0 ? void 0 : onlyComponentName.length) {
-        return { env: env, componentName: onlyComponentName };
-    }
-    return { env: env };
-};
-exports.getEnvComponentArgument = getEnvComponentArgument;
-/**
- * Parses the environment component argument and returns a Choice object.
- * @param envComponent - The environment component argument to parse.
- * @returns The parsed Choice object.
- * @throws Error if the env type is invalid.
- */
-var parseChoiceArgument = function (_a) {
-    var components = _a.components;
-    var _b = (0, exports.getEnvComponentArgument)(), env = _b.env, componentName = _b.componentName;
-    var componentNames = Object.keys(components);
-    if ((componentName === null || componentName === void 0 ? void 0 : componentName.length) && !componentNames.includes(componentName)) {
-        throw new Error("invalid component name! Component must be one of: ".concat(componentNames.join(', ')));
-    }
-    if (componentName === null || componentName === void 0 ? void 0 : componentName.length) {
-        return { env: env, componentName: componentName };
-    }
-    return { env: env };
-};
-exports.parseChoiceArgument = parseChoiceArgument;
-//# sourceMappingURL=parseChoiceArgument.js.map

package/dist/config/parseChoiceArgument.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"parseChoiceArgument.js","sourceRoot":"","sources":["../../src/config/parseChoiceArgument.ts"],"names":[],"mappings":";;;AACA,gDAA+D;AAG/D,IAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAS,CAAC,CAAC;AAEjC,IAAM,uBAAuB,GAAG;;IAIrC,IAAM,cAAc,GAAG,kBAAkB,CAAC;IAC1C,IAAM,SAAS,GAAG,IAAI,MAAM,CAC1B,aAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,eAAK,cAAc,cAAI,cAAc,OAAI,CAClE,CAAC;IACF,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,mCAAI,EAAE,CAAC;IACrC,IAAA,KACJ,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,EADnB,UAAa,EAAb,GAAG,mBAAG,OAAO,KAAA,EAAE,oBAAoB,QAAA,EAAE,iBAAiB,QACnC,CAAC;IAC/B,IAAI,CAAC,IAAA,wBAAa,EAAC,GAAG,CAAC,EAAE;QACvB,MAAM,IAAI,KAAK,CACb,4BAAqB,GAAG,oCAA0B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAE,CACxE,CAAC;KACH;IACD,IAAI,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,EAAE;QAChC,OAAO,EAAE,GAAG,KAAA,EAAE,aAAa,EAAE,oBAAoB,EAAE,CAAC;KACrD;IACD,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,EAAE;QAC7B,OAAO,EAAE,GAAG,KAAA,EAAE,aAAa,EAAE,iBAAiB,EAAE,CAAC;KAClD;IACD,OAAO,EAAE,GAAG,KAAA,EAAE,CAAC;AACjB,CAAC,CAAC;AAvBW,QAAA,uBAAuB,2BAuBlC;AAEF;;;;;GAKG;AACI,IAAM,mBAAmB,GAAG,UAAC,EAAsB;QAApB,UAAU,gBAAA;IACxC,IAAA,KAAyB,IAAA,+BAAuB,GAAE,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAA8B,CAAC;IACzD,IAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/C,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,KAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;QACpE,MAAM,IAAI,KAAK,CACb,4DAAqD,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAE,CACjF,CAAC;KACH;IACD,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,EAAE;QACzB,OAAO,EAAE,GAAG,KAAA,EAAE,aAAa,eAAA,EAAE,CAAC;KAC/B;IACD,OAAO,EAAE,GAAG,KAAA,EAAE,CAAC;AACjB,CAAC,CAAC;AAZW,QAAA,mBAAmB,uBAY9B"}

package/src/config/parseChoiceArgument.ts

@@ -1,50 +0,0 @@
-import type { Config, EnvType } from '@catladder/pipeline';
-import { ENV_TYPES, isKnowEnvType } from '@catladder/pipeline';
-import type { Choice } from '../apps/catenv/types';
-
-const envTypes = Object.keys(ENV_TYPES);
-
-export const getEnvComponentArgument = (): {
-  env: EnvType;
-  componentName?: string | undefined;
-} => {
-  const componentMatch = `([a-zA-Z0-9_-]+)`;
-  const argRegexp = new RegExp(
-    `^((${envTypes.join('|')}):${componentMatch}|${componentMatch})$`
-  );
-  const envComponent = process.argv[2] ?? '';
-  const [, , env = 'local', componentNameWithEnv, onlyComponentName] =
-    argRegexp.exec(envComponent);
-  if (!isKnowEnvType(env)) {
-    throw new Error(
-      `invalid env type! ${env}.\nEnv must be one of: ${envTypes.join(', ')}`
-    );
-  }
-  if (componentNameWithEnv?.length) {
-    return { env, componentName: componentNameWithEnv };
-  }
-  if (onlyComponentName?.length) {
-    return { env, componentName: onlyComponentName };
-  }
-  return { env };
-};
-
-/**
- * Parses the environment component argument and returns a Choice object.
- * @param envComponent - The environment component argument to parse.
- * @returns The parsed Choice object.
- * @throws Error if the env type is invalid.
- */
-export const parseChoiceArgument = ({ components }: Config): Choice => {
-  const { env, componentName } = getEnvComponentArgument();
-  const componentNames = Object.keys(components);
-  if (componentName?.length && !componentNames.includes(componentName)) {
-    throw new Error(
-      `invalid component name! Component must be one of: ${componentNames.join(', ')}`
-    );
-  }
-  if (componentName?.length) {
-    return { env, componentName };
-  }
-  return { env };
-};