@vaharoni/devops 1.1.7 → 1.1.8

package/dist/libs/k8s-generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"k8s-generate.d.ts","sourceRoot":"","sources":["../../src/libs/k8s-generate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAqB3I,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,UAaf;AAED,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAMvH;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,UAOf;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,UAMf;AA6FD,qBAAa,qBAAqB;IAIb,WAAW,EAAE,MAAM;IAAS,KAAK,EAAE,MAAM;IAAS,MAAM,EAAE,MAAM;IAHnF,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,YAAY,EAAE,IAAI,CAAC,qBAAqB,EAAE,cAAc,CAAC,CAAC;gBAEvC,WAAW,EAAE,MAAM,EAAS,KAAK,EAAE,MAAM,EAAS,MAAM,EAAE,MAAM;IAYnF,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,wBAAwB;IAmB7D,YAAY,IAAI,uBAAuB;IAOvC,QAAQ,IAAI,mBAAmB;CAMhC"}
+{"version":3,"file":"k8s-generate.d.ts","sourceRoot":"","sources":["../../src/libs/k8s-generate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAqB3I,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,UAaf;AAED,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAMvH;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,sBAQf;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,UAMf;AA6FD,qBAAa,qBAAqB;IAIb,WAAW,EAAE,MAAM;IAAS,KAAK,EAAE,MAAM;IAAS,MAAM,EAAE,MAAM;IAHnF,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,YAAY,EAAE,IAAI,CAAC,qBAAqB,EAAE,cAAc,CAAC,CAAC;gBAEvC,WAAW,EAAE,MAAM,EAAS,KAAK,EAAE,MAAM,EAAS,MAAM,EAAE,MAAM;IAYnF,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,wBAAwB;IAmB7D,YAAY,IAAI,uBAAuB;IAOvC,QAAQ,IAAI,mBAAmB;CAMhC"}

package/dist/libs/k8s-generate.js

@@ -5,7 +5,7 @@ import path from "path";
 import yaml from "yaml";
 import fs from 'fs';
 import { globSync } from "glob";
-import _, { template } from 'lodash';
+import _ from 'lodash';
 import Handlebars from "handlebars";
 import { getImageData } from "./config";
 import { getImageDescendentData } from "./discovery/images";
@@ -23,7 +23,7 @@ export function generateImageDeployments(monorepoEnv, image, gitSha) {
         return generateManifestForDeployment(projectData.rootPath, projectData.deployment.template, renderFn);
     });
     const debug = generateDebugDeployment(monorepoEnv, image, gitSha);
-    const manifest = [debug, ...apps].join("\n---\n");
+    const manifest = [debug, ...apps].filter(Boolean).join("\n---\n");
     return ensureProperDomainsPresent(manifest, monorepoEnv, image);
 }
 export function generateWorkspaceDeployment(packageData, monorepoEnv, image, gitSha) {
@@ -38,6 +38,8 @@ export function generateDebugDeployment(monorepoEnv, image, gitSha) {
     const context = generator.getDebug();
     const renderFn = (template) => Handlebars.compile(template)(context);
     const debugTemplate = getImageData(image)["debug-template"];
+    if (!debugTemplate)
+        return;
     return generateManifestsFromTemplateName(debugTemplate, renderFn).map(x => yaml.stringify(x)).join("\n---\n");
 }
 export function generateDbMigrateJob(monorepoEnv, image, gitSha) {

package/dist/libs/k8s-secrets-manager.d.ts

@@ -1,4 +1,5 @@
-export declare function getMonorepoSecret(monorepoEnv: string, keys?: string[]): string;
+export declare function getMonorepoSecretObject(monorepoEnv: string, keys?: string[]): Record<string, string>;
+export declare function getMonorepoSecretStr(monorepoEnv: string, keys?: string[]): string;
 /** E.g.: setMonorepoSecret('staging', ['KEY1=val1', 'KEY2=val2']) */
 export declare function setMonorepoSecret(monorepoEnv: string, pairs?: string[]): void;
 export declare function deleteMonorepoSecret(monorepoEnv: string, keys?: string[]): void;

package/dist/libs/k8s-secrets-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"k8s-secrets-manager.d.ts","sourceRoot":"","sources":["../../src/libs/k8s-secrets-manager.ts"],"names":[],"mappings":"AA0DA,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO,UAKzE;AAED,qEAAqE;AACrE,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,GAAE,MAAM,EAAO,QAQ1E;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO,QAE5E"}
+{"version":3,"file":"k8s-secrets-manager.d.ts","sourceRoot":"","sources":["../../src/libs/k8s-secrets-manager.ts"],"names":[],"mappings":"AAkBA,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO,0BAY/E;AA4BD,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO,UAS5E;AAED,qEAAqE;AACrE,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,GAAE,MAAM,EAAO,QAQ1E;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO,QAE5E"}

package/dist/libs/k8s-secrets-manager.js

@@ -9,7 +9,7 @@ function execUpdateSecret(monorepoEnv, secretValue) {
     const { fullCommand, redactedCommand } = patchSecretKeyCommand(monorepoEnv, secretName(), SECRET_FILE_NAME, JSON.stringify(secretValue));
     new CommandExecutor(fullCommand, { quiet: true, redactedCommand }).exec();
 }
-function getSecret(monorepoEnv, keys = []) {
+export function getMonorepoSecretObject(monorepoEnv, keys = []) {
     // Dots in jsonpath can only be accessed with a \ prefix
     const escapedSecretFileName = SECRET_FILE_NAME.replaceAll(".", "\\.");
     // prettier-ignore
@@ -28,7 +28,7 @@ function updateSecret(monorepoEnv, vars) {
         console.error("Keys-value pairs to set must be provided, e.g. KEY1=val1 KEY2=val2");
         process.exit(1);
     }
-    const current = getSecret(monorepoEnv);
+    const current = getMonorepoSecretObject(monorepoEnv);
     const newVars = { ...current, ...vars };
     execUpdateSecret(monorepoEnv, newVars);
 }
@@ -37,13 +37,16 @@ function deleteSecretKeys(monorepoEnv, keys = []) {
         console.error("Keys to delete must be provided");
         process.exit(1);
     }
-    const secretValue = getSecret(monorepoEnv);
+    const secretValue = getMonorepoSecretObject(monorepoEnv);
     keys.forEach((key) => delete secretValue[key]);
     execUpdateSecret(monorepoEnv, secretValue);
 }
 //= Interface (L3)
-export function getMonorepoSecret(monorepoEnv, keys = []) {
-    const value = getSecret(monorepoEnv, keys);
+export function getMonorepoSecretStr(monorepoEnv, keys = []) {
+    const value = getMonorepoSecretObject(monorepoEnv, keys);
+    if (Object.keys(value).length === 1) {
+        return Object.values(value)[0];
+    }
     return Object.entries(value)
         .map((pair) => pair.join("="))
         .join("\n");

package/dist/types/index.d.ts

@@ -7,6 +7,7 @@ export declare const constFileSchema: z.ZodObject<{
     "image-versions-to-keep": z.ZodOptional<z.ZodNumber>;
     "registry-base-url": z.ZodString;
     "registry-image-path-prefix": z.ZodOptional<z.ZodString>;
+    "cloudrun-artifact-registry-repo-path": z.ZodOptional<z.ZodString>;
     "extra-remote-environments": z.ZodArray<z.ZodString, "many">;
     "extra-local-environments": z.ZodArray<z.ZodString, "many">;
 }, "strip", z.ZodTypeAny, {
@@ -17,6 +18,7 @@ export declare const constFileSchema: z.ZodObject<{
     "extra-local-environments": string[];
     "image-versions-to-keep"?: number | undefined;
     "registry-image-path-prefix"?: string | undefined;
+    "cloudrun-artifact-registry-repo-path"?: string | undefined;
 }, {
     "project-name": string;
     infra: "hetzner" | "digitalocean" | "gcloud";
@@ -25,6 +27,7 @@ export declare const constFileSchema: z.ZodObject<{
     "extra-local-environments": string[];
     "image-versions-to-keep"?: number | undefined;
     "registry-image-path-prefix"?: string | undefined;
+    "cloudrun-artifact-registry-repo-path"?: string | undefined;
 }>;
 export type ConstFileSchema = z.infer<typeof constFileSchema>;
 declare const singleTemplateSchema: z.ZodObject<{
@@ -42,22 +45,25 @@ declare const singleImageSchema: z.ZodObject<{
     "image-template": z.ZodString;
     language: z.ZodEnum<["python", "node"]>;
     domains: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
-    "debug-template": z.ZodString;
+    "debug-template": z.ZodOptional<z.ZodString>;
+    cloudrun: z.ZodOptional<z.ZodBoolean>;
     "can-db-migrate": z.ZodOptional<z.ZodBoolean>;
     applications: z.ZodArray<z.ZodString, "many">;
 }, "strip", z.ZodTypeAny, {
     "image-template": string;
     language: "python" | "node";
-    "debug-template": string;
     applications: string[];
     domains?: Record<string, string> | undefined;
+    "debug-template"?: string | undefined;
+    cloudrun?: boolean | undefined;
     "can-db-migrate"?: boolean | undefined;
 }, {
     "image-template": string;
     language: "python" | "node";
-    "debug-template": string;
     applications: string[];
     domains?: Record<string, string> | undefined;
+    "debug-template"?: string | undefined;
+    cloudrun?: boolean | undefined;
     "can-db-migrate"?: boolean | undefined;
 }>;
 export type SingleImageSchema = z.infer<typeof singleImageSchema>;
@@ -76,22 +82,25 @@ export declare const imageFileSchema: z.ZodObject<{
         "image-template": z.ZodString;
         language: z.ZodEnum<["python", "node"]>;
         domains: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
-        "debug-template": z.ZodString;
+        "debug-template": z.ZodOptional<z.ZodString>;
+        cloudrun: z.ZodOptional<z.ZodBoolean>;
         "can-db-migrate": z.ZodOptional<z.ZodBoolean>;
         applications: z.ZodArray<z.ZodString, "many">;
     }, "strip", z.ZodTypeAny, {
         "image-template": string;
         language: "python" | "node";
-        "debug-template": string;
         applications: string[];
         domains?: Record<string, string> | undefined;
+        "debug-template"?: string | undefined;
+        cloudrun?: boolean | undefined;
         "can-db-migrate"?: boolean | undefined;
     }, {
         "image-template": string;
         language: "python" | "node";
-        "debug-template": string;
         applications: string[];
         domains?: Record<string, string> | undefined;
+        "debug-template"?: string | undefined;
+        cloudrun?: boolean | undefined;
         "can-db-migrate"?: boolean | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
@@ -102,9 +111,10 @@ export declare const imageFileSchema: z.ZodObject<{
     images: Record<string, {
         "image-template": string;
         language: "python" | "node";
-        "debug-template": string;
         applications: string[];
         domains?: Record<string, string> | undefined;
+        "debug-template"?: string | undefined;
+        cloudrun?: boolean | undefined;
         "can-db-migrate"?: boolean | undefined;
     }>;
 }, {
@@ -115,9 +125,10 @@ export declare const imageFileSchema: z.ZodObject<{
     images: Record<string, {
         "image-template": string;
         language: "python" | "node";
-        "debug-template": string;
         applications: string[];
         domains?: Record<string, string> | undefined;
+        "debug-template"?: string | undefined;
+        cloudrun?: boolean | undefined;
         "can-db-migrate"?: boolean | undefined;
     }>;
 }>;

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}

package/dist/types/index.js

@@ -7,6 +7,7 @@ export const constFileSchema = z.object({
     "image-versions-to-keep": z.number().optional(),
     "registry-base-url": z.string(),
     "registry-image-path-prefix": z.string().optional(),
+    "cloudrun-artifact-registry-repo-path": z.string().optional(),
     "extra-remote-environments": z.array(z.string()),
     "extra-local-environments": z.array(z.string()),
 });
@@ -18,7 +19,8 @@ const singleImageSchema = z.object({
     "image-template": z.string(),
     "language": z.enum(SUPPORTED_LANGUAGES),
     "domains": z.record(z.string()).optional(),
-    "debug-template": z.string(),
+    "debug-template": z.string().optional(),
+    "cloudrun": z.boolean().optional(),
     "can-db-migrate": z.boolean().optional(),
     applications: z.array(z.string()),
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vaharoni/devops",
   "type": "module",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "Devops utility",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/cli/cloudrun.ts

@@ -0,0 +1,133 @@
+import { CLICommandParser, printUsageAndExit, StrongParams } from "./common";
+import { buildDev, deploy } from "../libs/cloudrun-helpers";
+
+const oneLiner =
+  "Supports cloudrun images";
+const keyExamples = `
+    $ devops cloudrun deploy cloudrun-image SHA --env staging --region us-central1 [--forward-env ENV1,ENV2 --allow-unauthenticated]
+    $ devops cloudrun build-dev cloudrun-image
+`.trim();
+
+const usage = `
+${oneLiner}
+
+USAGE
+  Configuration prerequisites:
+    - The image should be defined in images.yaml with:
+      cloudrun: true
+    - The artifact registry URL should be set in config/constants.yaml:
+      cloudrun-artifact-registry-repo-path: REGION-docker.pkg.dev/PROJECT_ID/REPO
+
+  Deploy a cloudrun image to Cloud Run:
+    devops cloudrun deploy <image> <sha> --env <env> --region <region> [options]
+
+    Options:
+      --forward-env ENV1,ENV2     Comma-separated env var names to forward into the service
+      --allow-unauthenticated     Allow unauthenticated access
+      --cpu <cpu>                 CPU, e.g. 0.25, 0.5, 1
+      --memory <mem>              Memory, e.g. 256Mi, 512Mi, 1Gi
+      --min-instances <n>         Minimum instances
+      --max-instances <n>         Maximum instances
+      --timeout <time>            Request timeout, e.g. 60s
+      --                          Pass through additional args to gcloud (e.g. -- --ingress internal)
+
+      Notes: 
+      - The image must already be pushed to the artifact registry.
+      - <env> also supports local environments (e.g. development).
+      - For remote monorepo environments, variables specified in --forward-env that 
+        are not present in the current process's env are fetched from the cluster.
+
+  Build a cloudrun image locally in development environment:
+    devops cloudrun build-dev cloudrun-image
+
+    This command builds the image locally with a random SHA and pushes it to the artifact registry.
+
+EXAMPLES
+    ${keyExamples}
+`;
+
+const handlers = {
+  "build-dev": (opts: StrongParams) => {
+    buildDev(opts.required("image"));
+  },
+  _deploy: (opts: StrongParams) => {
+    const rawForwardEnv = opts.optional("forwardEnv");
+    const forwardEnv = rawForwardEnv
+      ? rawForwardEnv.split(",").map(v => v.trim()).filter(Boolean)
+      : [];
+    const minInstancesStr = opts.optional("minInstances");
+    const maxInstancesStr = opts.optional("maxInstances");
+
+    deploy({
+      image: opts.required("image"),
+      env: opts.required("env"),
+      sha: opts.required("sha"),
+      region: opts.required("region"),
+      forwardEnv,
+      allowUnauthenticated: opts.optional("allowUnauthenticated") === "true",
+      cpu: opts.optional("cpu"),
+      memory: opts.optional("memory"),
+      minInstances: minInstancesStr ? Number(minInstancesStr) : undefined,
+      maxInstances: maxInstancesStr ? Number(maxInstancesStr) : undefined,
+      timeout: opts.optional("timeout"),
+      extraArgs: opts.optional("extraArgs"),
+    });
+  },
+} as const;
+
+async function run(cmdObj: CLICommandParser) {
+  if (cmdObj.help || cmdObj.args.length === 0) printUsageAndExit(usage);
+  const parsed = cmdObj.parseOptions({
+    params: [
+      "--keep-last",
+      "--forward-env",
+      "--region",
+      "--cpu",
+      "--memory",
+      "--min-instances",
+      "--max-instances",
+      "--timeout",
+      "--sha",
+    ],
+    booleans: ["--allow-unauthenticated"],
+    passthroughArgs: true,
+  });
+  const [subcommand, image, sha] = parsed.args;
+
+  // Inject env variables as forwarding is needed
+  if (subcommand === "deploy") {
+    cmdObj.executorFromEnv(
+      `devops cloudrun _deploy ${cmdObj.args.slice(1).join(" ")}`,
+      { checkEnvYaml: false }
+    ).spawn();
+    return;
+  }
+
+  const handler = handlers[subcommand as keyof typeof handlers];
+  if (!handler) {
+    console.error(`Unknown subcommand: ${subcommand}`);
+    printUsageAndExit(usage);
+  }
+
+  const params = new StrongParams(usage, {
+    env: cmdObj.env,
+    subcommand,
+    image,
+    sha,
+    keepLast: parsed.options["--keep-last"],
+    forwardEnv: parsed.options["--forward-env"],
+    region: parsed.options["--region"],
+    allowUnauthenticated: parsed.options["--allow-unauthenticated"] ? "true" : undefined,
+    cpu: parsed.options["--cpu"],
+    memory: parsed.options["--memory"],
+    minInstances: parsed.options["--min-instances"],
+    maxInstances: parsed.options["--max-instances"],
+    timeout: parsed.options["--timeout"],
+    extraArgs: parsed.passthrough ? parsed.passthrough.join(" ") : undefined,
+  });
+  handler(params);
+}
+
+export default {
+  cloudrun: { oneLiner, keyExamples, run },
+};

package/src/cli/common.ts

@@ -4,10 +4,10 @@ import fs from "fs";
 import { globSync } from "glob";
 import { allSupportedEnvs } from "../libs/k8s-constants";
 
-type ParsedArgs = {
+type ParsedArgs<TBoolKeys extends readonly string[], TParamKeys extends readonly string[]> = {
   args: string[];
   argsStr: string;
-  options: { [key: string]: string | boolean };
+  options: Partial<Record<TBoolKeys[number], true>> & Partial<Record<TParamKeys[number], string>>;
   passthrough?: string[];
 };
 
@@ -27,8 +27,8 @@ export class CLICommandParser {
 
   constructor(cmdArray: string[]) {
     const parsedArgs = this._separateOptions(cmdArray.filter(Boolean), {
-      params: ["--env"],
-      booleans: ["--help", "--skip-env-check"],
+      params: ["--env"] as const,
+      booleans: ["--help", "--skip-env-check"] as const,
     });
     const [command, ...args] = parsedArgs.args;
     this.command = command;
@@ -67,18 +67,18 @@ export class CLICommandParser {
   //    # => { args: ['arg1'], options: { '--some-flag': true, '--in': 'workspace' } }
   //
   // Note that the global param --env is already extracted and can be accessed with cmd.env
-  parseOptions({
-    params = [],
-    booleans = [],
+  parseOptions<const TBoolKeys extends readonly string[], const TParamKeys extends readonly string[]>({
+    params,
+    booleans,
     passthroughArgs = false,
   }: {
     /** Param is used like so: --param value */
-    params?: string[];
+    params?: TParamKeys
     /** Boolean flag is used like so: --flag */
-    booleans?: string[];
+    booleans?: TBoolKeys;
     /** Pass through args are used like so: -- arg1 arg2 */
     passthroughArgs?: boolean;
-  } = {}): ParsedArgs {
+  } = {}): ParsedArgs<TBoolKeys, TParamKeys> {
     return this._separateOptions(this.args, {
       params,
       booleans,
@@ -97,46 +97,54 @@ export class CLICommandParser {
     return true;
   }
 
-  _separateOptions(
+  _separateOptions<const TBoolKeys extends readonly string[], const TParamKeys extends readonly string[]>(
     args: string[],
     {
-      params = [],
-      booleans = [],
+      params,
+      booleans,
       passthroughArgs = false,
     }: {
-      params?: string[];
-      booleans?: string[];
+      params?: TParamKeys;
+      booleans?: TBoolKeys;
       passthroughArgs?: boolean;
     } = {}
-  ): ParsedArgs {
-    const results: ParsedArgs = {
-      args: [],
-      argsStr: "",
-      options: {},
-      ...(passthroughArgs ? { passthrough: [] } : {}),
-    };
-    const paramsLookup = Object.fromEntries(params.map((x) => [x, true]));
-    const booleansLookup = Object.fromEntries(booleans.map((x) => [x, true]));
+  ): ParsedArgs<TBoolKeys, TParamKeys> {
+    const paramsLookup = new Set<TParamKeys[number]>(params ?? []);
+    const booleansLookup = new Set<TBoolKeys[number]>(booleans ?? []);
+    const isParam = (arg: string): arg is TParamKeys[number] => paramsLookup.has(arg);
+    const isBoolean = (arg: string): arg is TBoolKeys[number] => booleansLookup.has(arg);
+
     const passthroughArgsStart = passthroughArgs ? args.indexOf("--") : -1;
-    const numArgsToProcess =
-      passthroughArgsStart === -1 ? args.length : passthroughArgsStart;
+    // prettier-ignore
+    const numArgsToProcess = passthroughArgsStart === -1 ? args.length : passthroughArgsStart;
+
+    const getResPassthrough = () => {
+      if (!passthroughArgs || passthroughArgsStart < 0) return { passthrough: []};
+      return { passthrough: args.slice(passthroughArgsStart + 1) };
+    }
+
+    const resArgs: string[] = [];
+    const resParams: Partial<Record<TParamKeys[number], string>> = {};
+    const resOptions: Partial<Record<TBoolKeys[number], true>> = {};
+
     for (let i = 0; i < numArgsToProcess; ++i) {
       const curr = args[i];
-      if (paramsLookup[curr]) {
+      if (isParam(curr)) {
         const next = args[i + 1];
-        results.options[curr] = next;
+        resParams[curr] = next;
         ++i;
-      } else if (booleansLookup[curr]) {
-        results.options[curr] = true;
+      } else if (isBoolean(curr)) {
+        resOptions[curr] = true;
       } else {
-        results.args.push(curr);
+        resArgs.push(curr);
       }
     }
-    results.argsStr = results.args.join(" ");
-    if (passthroughArgs && passthroughArgsStart >= 0) {
-      results.passthrough = args.slice(passthroughArgsStart + 1);
-    }
-    return results;
+    return {
+      args: resArgs,
+      argsStr: resArgs.join(" "),
+      options: { ...resOptions, ...resParams },
+      ...getResPassthrough(),
+    };
   }
 }
 
@@ -220,10 +228,10 @@ export class CommandExecutor {
     const envToUse = this._getProcessEnv(env);
     return new Promise((resolve) => {
       try {
-        const [cmd, ...args] = fullCommand.split(" ").filter(Boolean);
-        const childProcess = spawn(cmd, args, {
+        const childProcess = spawn(fullCommand, {
           stdio: "inherit",
           env: envToUse,
+          shell: true,
         });
 
         childProcess.on("close", (code) => {

package/src/cli/db.ts

@@ -114,7 +114,7 @@ function run(cmdObj: CLICommandParser) {
   const parsed = cmdObj.parseOptions({ params: ["-p"] });
 
   const [command, namespace] = parsed.args;
-  const port = parsed.options["-p"] as string;
+  const port = parsed.options["-p"];
   // @ts-expect-error left as an exercise for the reader
   const handler = handlers[command];
   if (!handler) {

package/src/cli/dml.ts

@@ -107,7 +107,7 @@ function run(cmdObj: CLICommandParser) {
   });
   switch (parsed.args[0]) {
     case "create": {
-      const name = parsed.options["--name"] as string;
+      const name = parsed.options["--name"];
       if (!name) printUsageAndExit(usage);
       return createDml(name);
     }

package/src/cli/env.ts

@@ -1,7 +1,7 @@
 import { globSync } from "glob";
 import {
   deleteMonorepoSecret,
-  getMonorepoSecret,
+  getMonorepoSecretStr,
   setMonorepoSecret,
 } from "../libs/k8s-secrets-manager";
 import { CombinedEnvValidator } from "../libs/validate-env";
@@ -62,7 +62,7 @@ function run(cmdObj: CLICommandParser) {
     }
 
     case "get": {
-      console.log(getMonorepoSecret(cmdObj.env, rest));
+      console.log(getMonorepoSecretStr(cmdObj.env, rest));
       break;
     }
 

package/src/cli/exec.ts

@@ -32,7 +32,7 @@ function run(cmdObj: CLICommandParser) {
     params: ["--in"],
     booleans: ["--interactive"],
   });
-  const workspace = parsed.options["--in"] as string | undefined;
+  const workspace = parsed.options["--in"];
   let executor: CommandExecutor;
   if (workspace) {
     const rootPath = getWorkspace(workspace).rootPath;

package/src/cli/job.ts

@@ -65,7 +65,7 @@ function run(cmdObj: CLICommandParser) {
     printUsageAndExit(usage);
   }
 
-  const timeout = parsedArgs.options["--timeout"] as string | undefined;
+  const timeout = parsedArgs.options["--timeout"];
   const params = new StrongParams(usage, {
     env: cmdObj.env,
     image,

package/src/cli/prep-build.ts

@@ -3,8 +3,10 @@ import os from "os";
 import path from "path";
 import { CLICommandParser, printUsageAndExit } from "./common";
 import { getImageData, getTemplateData } from "../libs/config";
-import { getMonorepoSecret } from "../libs/k8s-secrets-manager";
+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 =
   "Copies all dependencies of an image to a temporary folder in preparation for a Docker build";
@@ -16,7 +18,10 @@ const usage = `
 ${oneLiner}
 
 USAGE
-    devops prep-build <image>
+    devops prep-build <image> --env <env>
+
+    If <env> is a remote environment (e.g. staging, production), the environment variables are 
+    fetched from the cluster and injected in case they are needed during the build process.
 
 EXAMPLES
     ${keyExamples}
@@ -61,8 +66,10 @@ async function run(cmdObj: CLICommandParser) {
     fs.copySync(dockerCommonPayloadPath, destFolder);
   }
 
-  console.warn(`COPYING Docker image payload`);
-  fs.copySync(dockerImagePayloadPath, destFolder);
+  if (fs.existsSync(dockerImagePayloadPath)) {
+    console.warn(`COPYING Docker image payload`);
+    fs.copySync(dockerImagePayloadPath, destFolder);
+  }
 
   console.warn(`COPYING .devops/config`);
   fs.mkdirSync(path.join(destFolder, ".devops"));
@@ -71,8 +78,29 @@ async function run(cmdObj: CLICommandParser) {
   // Create config directory. It should be deleted by the docker image so that it can be mounted as a volume when the pod is run
   console.warn(`CREATING config for the build process`);
   fs.mkdirSync(path.join(destFolder, "config"));
-  const envFileData = getMonorepoSecret(cmdObj.env);
-  fs.writeFileSync(path.join(destFolder, `config/.env.global`), envFileData);
+  const destGlobalEnvPath = path.join(destFolder, "config/.env.global");
+  if (isLocalOrRemoteEnv(cmdObj.env) === "remote") {
+    const envFileData = getMonorepoSecretStr(cmdObj.env);
+    fs.writeFileSync(destGlobalEnvPath, envFileData);
+  } else {
+    let anyCopied = false;
+    const localGlobalEnvPath = "config/.env.global";
+    const localEnvPath = `config/.env.${cmdObj.env}`;
+    const destEnvPath = path.join(destFolder, `config/.env.${cmdObj.env}`);
+    if (fs.existsSync(localGlobalEnvPath)) {
+      console.warn(`COPYING ${localGlobalEnvPath} to ${destGlobalEnvPath}`);
+      fs.copyFileSync(localGlobalEnvPath, destGlobalEnvPath);
+      anyCopied = true;
+    }
+    if (fs.existsSync(localEnvPath)) {
+      console.warn(`COPYING ${localEnvPath} to ${destEnvPath}`);
+      fs.copyFileSync(localEnvPath, destEnvPath);
+      anyCopied = true;
+    }
+    if (!anyCopied) {
+      console.warn(chalk.red(`\nWarning: local environment ${cmdObj.env} has no .env files. Environment variables will not be injected.\n`));
+    }
+  }
 
   // Copy all dependencies
   getImageDescendentData(image).forEach((project) => {