@vaharoni/devops 1.1.11 → 1.2.0

package/src/cli/{affected.ts → core/affected.ts}

@@ -3,9 +3,9 @@ import {
   findImagesWithAffectedWorkspace,
   isImageAffected,
   isWorkspaceAffected,
-} from "../libs/affected-entities";
-import { getImageData } from "../libs/config";
-import { CLICommandParser, printUsageAndExit, StrongParams } from "./common";
+} from "../../libs/affected-entities";
+import { getImageData } from "../../libs/config";
+import { CLICommandParser, printUsageAndExit, StrongParams } from "../common";
 
 const oneLiner =
   "Command to check whether an image or a workspace is affected by certain commit(s)";
@@ -111,6 +111,4 @@ async function run(cmdObj: CLICommandParser) {
   }
 }
 
-export default {
-  affected: { oneLiner, keyExamples, run },
-};
+export const affected = { oneLiner, keyExamples, run };

package/src/cli/{cloudrun.ts → core/cloudrun.ts}

@@ -1,5 +1,5 @@
-import { CLICommandParser, printUsageAndExit, StrongParams } from "./common";
-import { buildDev, deploy } from "../libs/cloudrun-helpers";
+import { CLICommandParser, printUsageAndExit, StrongParams } from "../common";
+import { buildDev, deploy } from "../../libs/cloudrun-helpers";
 
 const oneLiner =
   "Supports cloudrun images";
@@ -128,6 +128,4 @@ async function run(cmdObj: CLICommandParser) {
   handler(params);
 }
 
-export default {
-  cloudrun: { oneLiner, keyExamples, run },
-};
+export const cloudrun = { oneLiner, keyExamples, run };

package/src/cli/{console.ts → core/console.ts}

@@ -1,10 +1,10 @@
-import { getConst } from "../libs/config";
+import { getConst } from "../../libs/config";
 import {
   envToNamespace,
   imageDebugName,
-} from "../libs/k8s-constants";
-import { kubectlCommand } from "../libs/k8s-helpers";
-import { CLICommandParser, printUsageAndExit } from "./common";
+} from "../../libs/k8s-constants";
+import { kubectlCommand } from "../../libs/k8s-helpers";
+import { CLICommandParser, printUsageAndExit } from "../common";
 
 const oneLiner = "Get a shell into the debug pod of an image";
 const keyExamples = `
@@ -41,6 +41,4 @@ function run(cmdObj: CLICommandParser) {
     .spawn();
 }
 
-export default {
-  console: { oneLiner, keyExamples, run },
-};
+export const console = { oneLiner, keyExamples, run };

package/src/cli/{constant.ts → core/constant.ts}

@@ -1,5 +1,5 @@
-import { getConst } from "../libs/config";
-import { CLICommandParser, printUsageAndExit } from "./common";
+import { getConst } from "../../libs/config";
+import { CLICommandParser, printUsageAndExit } from "../common";
 
 const oneLiner = "Prints to stdout a constant from constant.yaml";
 const keyExamples = `$ devops constant infra`;
@@ -20,6 +20,4 @@ async function run(cmdObj: CLICommandParser) {
   console.log(getConst(constant as any));
 }
 
-export default {
-  constant: { oneLiner, keyExamples, run },
-};
+export const constant = { oneLiner, keyExamples, run };

package/src/cli/{env.ts → core/env.ts}

@@ -3,13 +3,13 @@ import {
   deleteMonorepoSecret,
   getMonorepoSecretStr,
   setMonorepoSecret,
-} from "../libs/k8s-secrets-manager";
-import { CombinedEnvValidator } from "../libs/validate-env";
+} from "../../libs/k8s-secrets-manager";
+import { CombinedEnvValidator } from "../../libs/validate-env";
 import {
   CLICommandParser,
   dotEnvFilesForEnv,
   printUsageAndExit,
-} from "./common";
+} from "../common";
 
 const oneLiner = "Commands to manipulate env variables";
 const keyExamples = `
@@ -82,6 +82,4 @@ function run(cmdObj: CLICommandParser) {
   }
 }
 
-export default {
-  env: { oneLiner, keyExamples, run },
-};
+export const env = { oneLiner, keyExamples, run };

package/src/cli/{exec.ts → core/exec.ts}

@@ -1,11 +1,11 @@
-import { CLICommandParser, CommandExecutor, printUsageAndExit } from "./common";
+import { CLICommandParser, CommandExecutor, printUsageAndExit } from "../common";
 import url from "url";
 import path from "path";
-import { getWorkspace } from "../libs/discovery";
+import { getWorkspace } from "../../libs/discovery";
 
 const __file__ = url.fileURLToPath(import.meta.url);
-const __src__ = path.join(path.dirname(__file__), "../..", "src");
-const execShPath = path.join(__src__, "cli/exec.sh");
+const __cli__ = path.join(path.dirname(__file__), "../..", "cli");
+const execShPath = path.join(__cli__, "exec.sh");
 
 const oneLiner =
   "Executes a command after injecting env variables, either globally or in a workspace";
@@ -52,6 +52,4 @@ function run(cmdObj: CLICommandParser) {
   }
 }
 
-export default {
-  exec: { oneLiner, keyExamples, run },
-};
+export const exec = { oneLiner, keyExamples, run };

package/src/cli/{image.ts → core/image.ts}

@@ -1,8 +1,8 @@
-import { deleteImageVersion, getImageVersion, getWorkspaceScale, resetWorkspaceScale, setImageVersion, setWorkspaceScale } from "../libs/k8s-image-config";
-import { CLICommandParser, printUsageAndExit, StrongParams } from "../../src/cli/common";
-import { generateImageDeployments } from "../libs/k8s-generate";
-import { applyHandler } from "../libs/k8s-helpers";
-import { getImageType } from "../libs/config";
+import { deleteImageVersion, getImageVersion, getWorkspaceScale, resetWorkspaceScale, setImageVersion, setWorkspaceScale } from "../../libs/k8s-image-config";
+import { CLICommandParser, printUsageAndExit, StrongParams } from "../../../src/cli/common";
+import { generateImageDeployments } from "../../libs/k8s-generate";
+import { applyHandler } from "../../libs/k8s-helpers";
+import { getImageType } from "../../libs/config";
 
 const oneLiner = "Applies image-related manifests, retrieves or set the version deployed, and scales deployments of applications";
 const keyExamples = `
@@ -206,6 +206,4 @@ function run(cmdObj: CLICommandParser) {
   handler(params);
 }
 
-export default {
-  image: { oneLiner, keyExamples, run },
-};
+export const image = { oneLiner, keyExamples, run };

package/src/cli/core/index.ts

@@ -0,0 +1,15 @@
+export * from "./run";
+export * from "./run-many";
+export * from "./exec";
+export * from "./affected";
+export * from "./cloudrun";
+export * from "./console";
+export * from "./constant";
+export * from "./env";
+export * from "./image";
+export * from "./init";
+export * from "./job";
+export * from "./namespace";
+export * from "./prep-build";
+export * from "./registry";
+export * from "./test";

package/src/cli/{init.ts → core/init.ts}

@@ -1,9 +1,9 @@
 import inquirer from "inquirer";
-import { InitGenerator, type InitGeneratorFileInfo } from "../libs/init-generator";
-import { CLICommandParser, printUsageAndExit } from "./common";
+import { InitGenerator, type InitGeneratorFileInfo } from "../../libs/init-generator";
+import { CLICommandParser, printUsageAndExit } from "../common";
 import chalk from "chalk";
 import fs from 'fs-extra';
-import type { ConstFileSchema } from "../types";
+import type { ConstFileSchema } from "../../types";
 
 const oneLiner =
   "Initializes the devops utility by copying template files to the current folder";
@@ -24,9 +24,7 @@ async function run(cmdObj: CLICommandParser) {
   createFiles();
 }
 
-export default {
-  init: { oneLiner, keyExamples, run },
-};
+export const init = { oneLiner, keyExamples, run };
 
 async function createFiles() {
   const tc = new InitGenerator();

package/src/cli/{job.ts → core/job.ts}

@@ -1,10 +1,10 @@
 import {
-} from "../libs/k8s-image-config";
-import { CLICommandParser, printUsageAndExit, StrongParams } from "../../src/cli/common";
-import { generateDbMigrateJob } from "../libs/k8s-generate";
-import { applyHandler } from "../libs/k8s-helpers";
-import { k8sJobWaiter, printJobStatuses } from "../libs/k8s-job-waiter";
-import { dbMigrateJobName } from "../libs/k8s-constants";
+} from "../../libs/k8s-image-config";
+import { CLICommandParser, printUsageAndExit, StrongParams } from "../common";
+import { generateDbMigrateJob } from "../../libs/k8s-generate";
+import { applyHandler } from "../../libs/k8s-helpers";
+import { k8sJobWaiter, printJobStatuses } from "../../libs/k8s-job-waiter";
+import { dbMigrateJobName } from "../../libs/k8s-constants";
 
 const oneLiner = "Creates a k8s job and waits for it to run";
 const keyExamples = `
@@ -75,6 +75,4 @@ function run(cmdObj: CLICommandParser) {
   handler(params);
 }
 
-export default {
-  job: { oneLiner, keyExamples, run },
-};
+export const job = { oneLiner, keyExamples, run };

package/src/cli/{namespace.ts → core/namespace.ts}

@@ -1,11 +1,9 @@
-import {
-} from "../libs/k8s-image-config";
-import { CLICommandParser, printUsageAndExit, StrongParams } from "../../src/cli/common";
+import { CLICommandParser, printUsageAndExit, StrongParams } from "../../../src/cli/common";
 import {
   copySecretHarborToNamespace,
   patchServiceAccountImagePullSecret,
-} from "../../src/libs/hetzner/reg-secret";
-import { checkEnvSetup, createEmptyEnvSecret, createNamespace, deleteNamespace, patchBaseSecret } from "../libs/k8s-namespace";
+} from "../../../src/libs/hetzner/reg-secret";
+import { checkEnvSetup, createEmptyEnvSecret, createNamespace, deleteNamespace, patchBaseSecret } from "../../libs/k8s-namespace";
 
 const oneLiner = "Creates the basic prerequisites for a monorepo";
 const keyExamples = `
@@ -73,6 +71,4 @@ function run(cmdObj: CLICommandParser) {
   handler(params);
 }
 
-export default {
-  namespace: { oneLiner, keyExamples, run },
-};
+export const namespace = { oneLiner, keyExamples, run };

package/src/cli/{prep-build.ts → core/prep-build.ts}

@@ -1,11 +1,11 @@
 import fs from "fs-extra";
 import os from "os";
 import path from "path";
-import { CLICommandParser, printUsageAndExit } from "./common";
-import { getImageData, getTemplateData } from "../libs/config";
-import { getMonorepoSecretStr } from "../libs/k8s-secrets-manager";
-import { getImageDescendentData } from "../libs/discovery/images";
-import { isLocalOrRemoteEnv } from "../libs/k8s-constants";
+import { CLICommandParser, printUsageAndExit } from "../common";
+import { getImageData, getTemplateData } from "../../libs/config";
+import { getMonorepoSecretStr } from "../../libs/k8s-secrets-manager";
+import { getImageDescendentData } from "../../libs/discovery/images";
+import { isLocalOrRemoteEnv } from "../../libs/k8s-constants";
 import chalk from "chalk";
 
 const oneLiner =
@@ -119,6 +119,4 @@ async function run(cmdObj: CLICommandParser) {
   console.log(destFolder);
 }
 
-export default {
-  "prep-build": { oneLiner, keyExamples, run },
-};
+export const prepBuild = { command: 'prep-build', oneLiner, keyExamples, run };

package/src/cli/{registry.ts → core/registry.ts}

@@ -1,11 +1,11 @@
-import { getConst, getImageData } from "../libs/config";
-import { prune } from "../libs/digital-ocean/container-reg";
+import { getConst } from "../../libs/config";
+import { prune } from "../../libs/digital-ocean/container-reg";
 import {
   containerRegistryPath,
   containerRegistryImageName,
   containerRegistryRepoPath,
-} from "../libs/k8s-constants";
-import { CLICommandParser, StrongParams, printUsageAndExit } from "./common";
+} from "../../libs/k8s-constants";
+import { CLICommandParser, StrongParams, printUsageAndExit } from "../common";
 
 const oneLiner = "Manage container repositories";
 const keyExamples = `
@@ -81,6 +81,4 @@ function run(cmdObj: CLICommandParser) {
   handler(params);
 }
 
-export default {
-  registry: { oneLiner, keyExamples, run },
-};
+export const registry = { oneLiner, keyExamples, run };

package/src/cli/{run-many.ts → core/run-many.ts}

@@ -1,5 +1,5 @@
-import { workspaceDirectoryForLanguage } from "../libs/discovery";
-import { CLICommandParser, printUsageAndExit } from "./common";
+import { workspaceDirectoryForLanguage } from "../../libs/discovery";
+import { CLICommandParser, printUsageAndExit } from "../common";
 import concurrently, {
   type ConcurrentlyCommandInput,
   type ConcurrentlyOptions,
@@ -56,6 +56,4 @@ async function run(cmdObj: CLICommandParser) {
     });
 }
 
-export default {
-  "run-many": { oneLiner, keyExamples, run },
-};
+export const runMany = { command: 'run-many', oneLiner, keyExamples, run };

package/src/cli/{run.ts → core/run.ts}

@@ -1,11 +1,11 @@
-import { CLICommandParser, printUsageAndExit } from "./common";
+import { CLICommandParser, printUsageAndExit } from "../common";
 import url from "url";
 import path from "path";
-import { getWorkspace } from "../libs/discovery";
+import { getWorkspace } from "../../libs/discovery";
 
 const __file__ = url.fileURLToPath(import.meta.url);
-const __src__ = path.join(path.dirname(__file__), "../..", "src");
-const execShPath = path.join(__src__, "cli/exec.sh");
+const __cli__ = path.join(path.dirname(__file__), "../..", "cli");
+const execShPath = path.join(__cli__, "exec.sh");
 
 const oneLiner =
   "Runs a script defined in package.json after injecting env variables";
@@ -25,7 +25,7 @@ EXAMPLES
     ${keyExamples}
 `;
 
-async function run(cmdObj: CLICommandParser) {
+async function runFn(cmdObj: CLICommandParser) {
   if (cmdObj.help || cmdObj.args.length === 0) printUsageAndExit(usage);
   const [workspace, script] = cmdObj.args[0].split(":");
   if (!workspace || !script) printUsageAndExit(usage);
@@ -41,6 +41,4 @@ async function run(cmdObj: CLICommandParser) {
     .spawn();
 }
 
-export default {
-  run: { oneLiner, keyExamples, run },
-};
+export const run = { oneLiner, keyExamples, run: runFn };

package/src/cli/{test.ts → core/test.ts}

@@ -1,4 +1,4 @@
-import { CLICommandParser, CommandExecutor, printUsageAndExit } from "./common";
+import { CLICommandParser, CommandExecutor, printUsageAndExit } from "../common";
 
 const oneLiner = "Runs tests in all projects or one specific project";
 const keyExamples = `
@@ -25,6 +25,4 @@ function run(cmdObj: CLICommandParser) {
   }
 }
 
-export default {
-  test: { oneLiner, keyExamples, run },
-};
+export const test = { oneLiner, keyExamples, run };

package/src/cli/{dml.ts → extensions/dml.ts}

@@ -1,5 +1,5 @@
 import fs from "fs";
-import { CLICommandParser, printUsageAndExit } from "./common";
+import { CLICommandParser, printUsageAndExit } from "../common";
 
 const oneLiner = "Utilities to manage and run DML scripts in the db project";
 const keyExamples = `
@@ -121,6 +121,4 @@ function run(cmdObj: CLICommandParser) {
   }
 }
 
-export default {
-  dml: { oneLiner, keyExamples, run },
-};
+export const dml = { oneLiner, keyExamples, run };

package/src/cli/extensions/index.ts

@@ -0,0 +1,8 @@
+export * from "./dml";
+export * from "./internal-curl";
+export * from "./jwt";
+export * from "./prisma";
+export * from "./redis-bitnami";
+export * from "./redis-ha";
+export * from "./stackgres";
+export * from "./template";

package/src/cli/{internal-curl.ts → extensions/internal-curl.ts}

@@ -1,5 +1,5 @@
-import { InternalToken } from "../app-support/crypto";
-import { CLICommandParser, printUsageAndExit } from "./common";
+import { InternalToken } from "../../app-support/crypto";
+import { CLICommandParser, printUsageAndExit } from "../common";
 
 const oneLiner =
   "Runs a curl command bearing an internal jwt-like token to allow verifying internal communication within the namespace";
@@ -43,6 +43,4 @@ async function run(cmdObj: CLICommandParser) {
   cmdObj.executorFromEnv(`curl -H "Authorization: Bearer ${token}" ${rest.join(" ")}`).exec();
 }
 
-export default {
-  'internal-curl': { oneLiner, keyExamples, run },
-};
+export const internalCurl = { command: 'internal-curl', oneLiner, keyExamples, run };

package/src/cli/{jwt.ts → extensions/jwt.ts}

@@ -1,5 +1,5 @@
-import { InternalToken } from "../app-support/crypto";
-import { CLICommandParser, printUsageAndExit } from "./common";
+import { InternalToken } from "../../app-support/crypto";
+import { CLICommandParser, printUsageAndExit } from "../common";
 
 const oneLiner =
   "Returns a JWT-like token to allow verifying internal communication within the namespace";
@@ -27,6 +27,4 @@ async function run(cmdObj: CLICommandParser) {
   console.log(new InternalToken(subject).generate());
 }
 
-export default {
-  jwt: { oneLiner, keyExamples, run },
-};
+export const jwt = { oneLiner, keyExamples, run };

package/src/cli/{prisma.ts → extensions/prisma.ts}

@@ -1,10 +1,10 @@
-import { CLICommandParser, printUsageAndExit } from "./common";
+import { CLICommandParser } from "../common";
 import url from "url";
 import path from "path";
 
 const __file__ = url.fileURLToPath(import.meta.url);
-const __src__ = path.join(path.dirname(__file__), "../..", "src");
-const execShPath = path.join(__src__, "cli/exec.sh");
+const __cli__ = path.join(path.dirname(__file__), "../..", "cli");
+const execShPath = path.join(__cli__, "exec.sh");
 
 const oneLiner = "Runs prisma commands in the db project after injecting the environment variables";
 const keyExamples = `$ devops prisma migrate dev`;
@@ -28,6 +28,4 @@ async function run(cmdObj: CLICommandParser) {
   ).spawn()
 }
 
-export default {
-  prisma: { oneLiner, keyExamples, run },
-};
+export const prisma = { oneLiner, keyExamples, run };

package/src/cli/{redis.ts → extensions/redis-bitnami.ts}

@@ -1,9 +1,9 @@
 import chalk from "chalk";
-import { establishRedisTunnel, getRedisList, getRedisPassword } from "../libs/k8s-redis";
-import { CLICommandParser, printUsageAndExit, StrongParams } from "./common";
+import { establishRedisTunnel, getRedisList, getRedisPassword } from "../../libs/k8s-redis-bitnami";
+import { CLICommandParser, printUsageAndExit, StrongParams } from "../common";
 
 const oneLiner =
-  "Utilities to help accessing production and staging redis";
+  "Utilities to help accessing production and staging redis installation from Bitnami";
 const keyExamples = `
     $ devops redis list
     $ devops redis password  redis-staging
@@ -78,6 +78,4 @@ function run(cmdObj: CLICommandParser) {
   handler(params);
 }
 
-export default {
-  redis: { oneLiner, keyExamples, run },
-};
+export const redisBitnami = { name: 'redis-bitnami', command: 'redis', oneLiner, keyExamples, run };

package/src/cli/extensions/redis-ha.ts

@@ -0,0 +1,57 @@
+import { CLICommandParser, printUsageAndExit, StrongParams } from "../common";
+import { establishRedisTunnel, getRedisList } from "../../libs/k8s-redis-ha";
+
+const oneLiner =
+  "Utilities to help accessing production and staging redis installation from redis-ha";
+const keyExamples = `
+    $ devops redis list
+    $ devops redis tunnel    redis-staging
+`.trim();
+
+const usage = `
+${oneLiner}
+
+COMMANDS
+    list                                  Lists the available redis installations
+    tunnel   <namespace> [-p <port>]      Sets up a tunnel to the remote Redis instance so you can access the DB from your local machine on port 9379 by default
+
+NOTES
+    This command assumes the namespace and the helm release name are the same.
+    The --env flag should not be used with these commands, as the Redis namespaces follow different conventions than the monorepo env. 
+
+EXAMPLES
+    ${keyExamples}
+`;
+
+const handlers = {
+  list: () => {
+    const res = getRedisList();
+    console.log(res);
+  },
+  tunnel: (opts: StrongParams) => {
+    const namespace = opts.required("namespace");
+    const port = opts.optional("port") ?? '9379';
+    establishRedisTunnel(namespace, port);
+  },
+};
+
+function run(cmdObj: CLICommandParser) {
+  if (cmdObj.help || cmdObj.args.length < 1) printUsageAndExit(usage);
+  const parsed = cmdObj.parseOptions({ params: ["-p"] });
+
+  const [command, namespace] = parsed.args;
+  const port = parsed.options["-p"];
+  // @ts-expect-error left as an exercise for the reader
+  const handler = handlers[command];
+  if (!handler) {
+    console.error(`Unknown command: ${command}`);
+    printUsageAndExit(usage);
+  }
+  const params = new StrongParams(usage, {
+    namespace,
+    port,
+  });
+  handler(params);
+}
+
+export const redisHa = { name: 'redis-ha', command: 'redis', oneLiner, keyExamples, run };

package/src/cli/{db.ts → extensions/stackgres.ts}

@@ -6,8 +6,8 @@ import {
   getDbBackups,
   getDbList,
   getDbPasswords,
-} from "../libs/k8s-db";
-import { CLICommandParser, printUsageAndExit, StrongParams } from "./common";
+} from "../../libs/k8s-db";
+import { CLICommandParser, printUsageAndExit, StrongParams } from "../common";
 
 const oneLiner =
   "Utilities to help day to day operations of production and staging databases";
@@ -128,6 +128,4 @@ function run(cmdObj: CLICommandParser) {
   handler(params);
 }
 
-export default {
-  db: { oneLiner, keyExamples, run },
-};
+export const stackgres = { command: 'db', oneLiner, keyExamples, run };

package/src/cli/{template.ts → extensions/template.ts}

@@ -1,11 +1,11 @@
 import {
-} from "../libs/k8s-image-config";
-import { CLICommandParser, printUsageAndExit, StrongParams } from "../../src/cli/common";
-import { generateDbMigrateJob, generateDebugDeployment, generateWorkspaceDeployment, ImageContextGenerator } from "../libs/k8s-generate";
+} from "../../libs/k8s-image-config";
+import { CLICommandParser, printUsageAndExit, StrongParams } from "../common";
+import { generateDbMigrateJob, generateDebugDeployment, generateWorkspaceDeployment, ImageContextGenerator } from "../../libs/k8s-generate";
 import chalk from "chalk";
-import { getWorkspace } from "../libs/discovery";
-import { getWorkspaceImages } from "../libs/discovery/images";
-import { getImageData, getImageNames } from "../libs/config";
+import { getWorkspace } from "../../libs/discovery";
+import { getWorkspaceImages } from "../../libs/discovery/images";
+import { getImageData, getImageNames } from "../../libs/config";
 
 const SUPPORTED_CONTEXT_TYPES = ['deployment', 'db-migrate', 'debug'];
 
@@ -164,6 +164,4 @@ function run(cmdObj: CLICommandParser) {
   handler(params);
 }
 
-export default {
-  template: { oneLiner, keyExamples, run },
-};
+export const template = { oneLiner, keyExamples, run };