@catladder/cli 1.40.4 → 1.41.2

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

@@ -1,6 +1,6 @@
 import { spawn } from "child-process-promise";
 import fetch from "node-fetch";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 
 export default async (vorpal: Vorpal) => {
   vorpal.command("dadjoke", "something for jonas.").action(async function () {

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

@@ -1,9 +1,9 @@
-import { Config } from "@catladder/pipeline";
+import type { Config } from "@catladder/pipeline";
 import { spawn, exec } from "child-process-promise";
 import { writeFile } from "fs-extra";
 import { dump } from "js-yaml";
 import { format } from "prettier";
-import { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
 import { getGitRoot } from "../../../utils/projects";
 
 export const writeConfig = async (

package/src/apps/cli/verify/index.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getGitlabCi,
   getProjectConfig,

package/src/apps/cli/verify/migration/fromv2.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   BuildConfig,
   ComponentConfig,
   Config,
@@ -14,7 +14,7 @@ import {
 } from "fs-extra";
 import { isEmpty } from "lodash";
 import { join } from "path";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getGitlabCi,
   getGitlabCiFilePath,
@@ -24,11 +24,8 @@ import { syncBitwarden } from "../../../../utils/passwordstore";
 import { getGitRoot } from "../../../../utils/projects";
 import { writeConfig } from "../../config/writeConfig";
 import { migrateSecrets } from "./migrateSecrets";
-import {
-  detectBuildConfig,
-  isOldInclude,
-  OldGitlabCiFile,
-} from "./oldGitlabCi";
+import type { OldGitlabCiFile } from "./oldGitlabCi";
+import { detectBuildConfig, isOldInclude } from "./oldGitlabCi";
 export const LEGACY_ENVS = [
   "dev-local",
   "dev",

package/src/apps/cli/verify/migration/migrateSecrets.ts

@@ -1,10 +1,11 @@
-import { Config, getEnvironment } from "@catladder/pipeline";
+import type { Config } from "@catladder/pipeline";
+import { getEnvironment } from "@catladder/pipeline";
 import { load } from "js-yaml";
 import { pick } from "lodash";
-import { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
 import { upsertAllVariables } from "../../../../utils/gitlab";
 import { readPass, trashItem } from "../../../../utils/passwordstore";
-import { LEGACY_ENVS } from "./fromv2";
+import type { LEGACY_ENVS } from "./fromv2";
 
 const getPassPath = (newConfig: Config, env: string) => {
   return `${newConfig.customerName}/${newConfig.appName}/${env}/secrets.yml`;

package/src/apps/cli/verify/migration/oldGitlabCi.ts

@@ -1,4 +1,4 @@
-import { BuildConfig } from "@catladder/pipeline";
+import type { BuildConfig } from "@catladder/pipeline";
 
 export type OldGitlabCiFile = {
   variables: {

package/src/catenv.ts

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

package/src/config/getProjectConfig.ts

@@ -1,19 +1,22 @@
+import type {
+  Config} from "@catladder/pipeline";
 import {
   readConfigSync,
   getAllEnvs,
   getEnvironment as _getEnvironment,
   createContext,
-  getSecretVarName,
-  Config,
+  getSecretVarName
 } from "@catladder/pipeline";
 
-import { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
 import { getAllVariables, getVariableValueByRawName } from "../utils/gitlab";
 
 import { getGitRoot } from "../utils/projects";
 import { readYaml } from "../utils/files";
 import { watch } from "fs";
 
+export { parseChoice } from "./parseChoice";
+
 let currentConfig: Config = null;
 
 // reload the config on change
@@ -59,11 +62,6 @@ export const getProjectComponents = async () => {
   return Object.keys(config.components);
 };
 
-export const parseChoice = (envComponent: string) => {
-  const [env, componentName] = envComponent.split(":").map((x) => x || null);
-  return { env, componentName };
-};
-
 export const getPipelineContextByChoice = async (
   env: string,
   componentName: string

package/src/config/parseChoice.ts

@@ -0,0 +1,4 @@
+export const parseChoice = (envComponent: string) => {
+  const [env, componentName] = envComponent.split(":").map((x) => x || null);
+  return { env, componentName };
+};

package/src/kubernetes/index.ts

@@ -0,0 +1,27 @@
+import { parseChoice } from "../config/parseChoice";
+import { getk8sApi } from "../k8sApi";
+import { getProjectNamespace } from "../utils/projects";
+
+export const getProjectPods = async (envComponent: string) => {
+  const namespace = await getProjectNamespace(envComponent);
+  const k8sApi = getk8sApi();
+  const res = await k8sApi.listNamespacedPod(namespace);
+
+  const { componentName } = parseChoice(envComponent);
+  return res.body.items.filter((item) =>
+    componentName ? item.metadata?.name?.includes(componentName + "-") : true
+  );
+};
+
+export const getProjectPvcs = async (envComponent: string) => {
+  const namespace = await getProjectNamespace(envComponent);
+  const k8sApi = getk8sApi();
+  const res = await k8sApi.listNamespacedPersistentVolumeClaim(namespace);
+
+  return res.body.items;
+};
+
+export const getProjectPodNames = async (envComponent: string) => {
+  const pods = await getProjectPods(envComponent);
+  return pods.map((n) => n.metadata.name);
+};

package/src/types/child-process-promise.d.ts

@@ -1 +1,36 @@
-declare module 'child-process-promise'
+import type { ReadStream } from "fs-extra";
+
+declare module "child-process-promise" {
+  function exec(
+    cmd: string,
+    options?: {
+      env?: Record<string, string>;
+    }
+  ): Promise<{
+    stdout: string;
+  }>;
+
+  type Stdio = "inherit" | "pipe";
+  type SpawnOptions = {
+    stdio?: Stdio | Stdio[];
+    shell?: boolean;
+    env?: Record<string, string>;
+  };
+
+  function spawn(
+    cmd: string,
+    options?: SpawnOptions
+  ): Promise<{
+    stdout: string;
+  }>;
+
+  function spawn(
+    cmd: string,
+    args: string[],
+    options?: SpawnOptions
+  ): Promise<unknown> & {
+    childProcess: {
+      stdout: ReadStream;
+    };
+  };
+}

package/src/utils/gitlab.ts

@@ -4,7 +4,7 @@ import { has, isObject, times } from "lodash";
 import memoizee from "memoizee";
 import fetch from "node-fetch";
 import open from "open";
-import { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
 import { getPreference, hasPreference, setPreference } from "./preferences";
 
 const TOKEN_KEY = "gitlab-personal-access-token";

package/src/utils/passwordstore/index.ts

@@ -15,7 +15,7 @@ const unlockBitwarden = async () => {
   let session = null;
   promise.childProcess.stdout.on(
     "data",
-    (d: any) => (session = d.toString("utf-8"))
+    (d) => (session = d.toString("utf-8"))
   );
   await promise;
   await setPreference("bwsession", session);
@@ -30,7 +30,7 @@ const loginBitwarden = async () => {
   let session = null;
   promise.childProcess.stdout.on(
     "data",
-    (d: any) => (session = d.toString("utf-8"))
+    (d) => (session = d.toString("utf-8"))
   );
   await promise;
   await setPreference("bwsession", session);

package/src/utils/projects/index.ts

@@ -1,6 +1,6 @@
 import { join } from "path";
 import { getProjectConfig, parseChoice } from "../../config/getProjectConfig";
-import { getk8sApi } from "../../k8sApi";
+
 import { readFileOrError } from "../files";
 import { exec } from "child-process-promise";
 
@@ -29,27 +29,3 @@ export const getProjectNamespace = async (envComponent: string) => {
   const config = await getProjectConfig();
   return `${config.customerName}-${config.appName}-${env}`;
 };
-
-export const getProjectPods = async (envComponent: string) => {
-  const namespace = await getProjectNamespace(envComponent);
-  const k8sApi = getk8sApi();
-  const res = await k8sApi.listNamespacedPod(namespace);
-
-  const { componentName } = parseChoice(envComponent);
-  return res.body.items.filter((item) =>
-    componentName ? item.metadata?.name?.includes(componentName + "-") : true
-  );
-};
-
-export const getProjectPvcs = async (envComponent: string) => {
-  const namespace = await getProjectNamespace(envComponent);
-  const k8sApi = getk8sApi();
-  const res = await k8sApi.listNamespacedPersistentVolumeClaim(namespace);
-
-  return res.body.items;
-};
-
-export const getProjectPodNames = async (envComponent: string) => {
-  const pods = await getProjectPods(envComponent);
-  return pods.map((n) => n.metadata.name);
-};