@vaharoni/devops 1.2.0 → 1.2.2

package/dist/cli/common.d.ts

@@ -62,8 +62,9 @@ export declare class CommandExecutor {
         env?: object;
     }): number;
     /** Should be used for CLI commands intended to be used locally. Provides interactivity. Unlike exec(), stdout is not returned. */
-    spawn({ env }?: {
-        env?: {} | undefined;
+    spawn({ env, pipeStdoutTo }?: {
+        env?: object;
+        pipeStdoutTo?: "stderr";
     }): Promise<unknown>;
     _prepareFullCommand(): string;
     _getProcessEnv(envOverride?: {}): {

package/dist/cli/common.d.ts.map

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

package/dist/cli/common.js

@@ -144,17 +144,21 @@ export class CommandExecutor {
         }
     }
     /** Should be used for CLI commands intended to be used locally. Provides interactivity. Unlike exec(), stdout is not returned. */
-    spawn({ env = {} } = {}) {
+    spawn({ env, pipeStdoutTo } = {}) {
         this._checkEnvYamlFiles();
         const fullCommand = this._prepareFullCommand();
         const envToUse = this._getProcessEnv(env);
+        const stdio = pipeStdoutTo === "stderr" ? ["inherit", "pipe", "inherit"] : "inherit";
         return new Promise((resolve) => {
             try {
                 const childProcess = spawn(fullCommand, {
-                    stdio: "inherit",
+                    stdio,
                     env: envToUse,
                     shell: true,
                 });
+                if (pipeStdoutTo === "stderr") {
+                    childProcess.stdout?.pipe(process.stderr);
+                }
                 childProcess.on("close", (code) => {
                     if (code !== 0) {
                         console.error(chalk.red(`Process exited with code ${code}`));

package/dist/cli/core/console.d.ts

@@ -1,6 +1,7 @@
 import { CLICommandParser } from "../common";
 declare function run(cmdObj: CLICommandParser): void;
-export declare const console: {
+export declare const consoleCommand: {
+    command: string;
     oneLiner: string;
     keyExamples: string;
     run: typeof run;

package/dist/cli/core/console.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../../src/cli/core/console.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,WAAW,CAAC;AAgBhE,iBAAS,GAAG,CAAC,MAAM,EAAE,gBAAgB,QAmBpC;AAED,eAAO,MAAM,OAAO;;;;CAAiC,CAAC"}
+{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../../src/cli/core/console.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAsC,MAAM,WAAW,CAAC;AAsBjF,iBAAS,GAAG,CAAC,MAAM,EAAE,gBAAgB,QA2BpC;AAMD,eAAO,MAAM,cAAc;;;;;CAAqD,CAAC"}

package/dist/cli/core/console.js

@@ -1,15 +1,21 @@
-import { getConst } from "../../libs/config";
-import { envToNamespace, imageDebugName, } from "../../libs/k8s-constants";
+import { generateDebugPod } from "../../libs/k8s-generate";
 import { kubectlCommand } from "../../libs/k8s-helpers";
-import { CLICommandParser, printUsageAndExit } from "../common";
-const oneLiner = "Get a shell into the debug pod of an image";
+import { getImageVersion } from "../../libs/k8s-image-config";
+import { CLICommandParser, CommandExecutor, printUsageAndExit } from "../common";
+import yaml from "yaml";
+const oneLiner = "Spin up a debug pod of the specified image and get a shell into it.";
 const keyExamples = `
 $ devops console main-node
 `.trim();
 const usage = `
 ${oneLiner}
 
-Each image has a debug pod. This command gets a shell into the debug pod of the specified image.
+USAGE
+    devops console <image> [--version <version>]
+
+    Options:
+      --version <version>    The version (git SHA) of the image to use. 
+                             If not specified, the live version of the image (obtained using 'devops image version get <image>') is used.
 
 EXAMPLES
   ${keyExamples}
@@ -17,17 +23,28 @@ EXAMPLES
 function run(cmdObj) {
     if (cmdObj.help || cmdObj.args.length === 0)
         printUsageAndExit(usage);
-    const image = cmdObj.args[0];
-    const debugName = imageDebugName(image);
-    const namespace = envToNamespace(cmdObj.env);
-    const podName = cmdObj
-        .executorFromEnv(kubectlCommand(`get pod -n ${namespace} -l app=${debugName} -o name`, {
-        namespace,
-    }), { quiet: true })
-        .exec()
-        .trim();
-    cmdObj
-        .executorFromEnv(kubectlCommand(`exec -it ${podName} -- /bin/bash`, { namespace }))
-        .spawn();
+    const parsed = cmdObj.parseOptions({ params: ["--version"] });
+    if (parsed.args.length !== 1)
+        printUsageAndExit(usage);
+    const image = parsed.args[0];
+    const version = parsed.options["--version"];
+    const gitSha = version ?? getImageVersion(cmdObj.env, image);
+    if (!gitSha) {
+        console.error(`No git SHA found for image ${image} in environment ${cmdObj.env}`);
+        process.exit(1);
+    }
+    const debugYaml = generateDebugPod(cmdObj.env, image, gitSha);
+    if (!debugYaml) {
+        console.error(`The image ${image} does not specify debug-template in images.yaml`);
+        process.exit(1);
+    }
+    const userName = new CommandExecutor(`kubectl auth whoami -o jsonpath='{.status.userInfo.username}'`).exec();
+    const debugManifestsJson = JSON.stringify(yaml.parse(debugYaml));
+    const randomId = Math.random().toString(36).substring(2, 10);
+    const podName = ['ephemeral-console', slugify(userName), slugify(image), randomId].filter(Boolean).join('-');
+    new CommandExecutor(kubectlCommand(`run ${podName} --restart=Never --rm -it --image=overridden --overrides='${debugManifestsJson}'`, { monorepoEnv: cmdObj.env })).spawn();
+}
+function slugify(str, maxLength = 20) {
+    return str.toLowerCase().trim().replace(/[^a-zA-Z0-9]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '').slice(0, maxLength);
 }
-export const console = { oneLiner, keyExamples, run };
+export const consoleCommand = { command: 'console', oneLiner, keyExamples, run };

package/dist/cli/extensions/template.js

@@ -1,6 +1,6 @@
 import {} from "../../libs/k8s-image-config";
 import { CLICommandParser, printUsageAndExit, StrongParams } from "../common";
-import { generateDbMigrateJob, generateDebugDeployment, generateWorkspaceDeployment, ImageContextGenerator } from "../../libs/k8s-generate";
+import { generateDbMigrateJob, generateDebugPod, generateWorkspaceDeployment, ImageContextGenerator } from "../../libs/k8s-generate";
 import chalk from "chalk";
 import { getWorkspace } from "../../libs/discovery";
 import { getWorkspaceImages } from "../../libs/discovery/images";
@@ -93,7 +93,7 @@ const handlers = {
         'debug': (opts) => {
             const image = opts.required('workspaceOrImage');
             console.warn(chalk.green(`\nThis is a sample of generated manifests for the debug image ${image}:\n`));
-            console.log(generateDebugDeployment(opts.required('env'), image, 'dummy-sha'));
+            console.log(generateDebugPod(opts.required('env'), image, 'dummy-sha'));
         },
     },
 };

package/dist/libs/cloudrun-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cloudrun-helpers.d.ts","sourceRoot":"","sources":["../../src/libs/cloudrun-helpers.ts"],"names":[],"mappings":"AA0CA,wBAAsB,QAAQ,CAAC,KAAK,EAAE,MAAM,iBA0B3C;AAED,wBAAsB,MAAM,CAAC,EAC3B,KAAK,EACL,GAAG,EACH,GAAG,EACH,MAAM,EACN,UAAe,EACf,oBAA4B,EAC5B,GAAY,EACZ,MAAgB,EAChB,YAAgB,EAChB,YAAgB,EAChB,OAAe,EACf,SAAc,GACf,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,iBAsBA"}
+{"version":3,"file":"cloudrun-helpers.d.ts","sourceRoot":"","sources":["../../src/libs/cloudrun-helpers.ts"],"names":[],"mappings":"AA0CA,wBAAsB,QAAQ,CAAC,KAAK,EAAE,MAAM,iBA2B3C;AAED,wBAAsB,MAAM,CAAC,EAC3B,KAAK,EACL,GAAG,EACH,GAAG,EACH,MAAM,EACN,UAAe,EACf,oBAA4B,EAC5B,GAAY,EACZ,MAAgB,EAChB,YAAgB,EAChB,YAAgB,EAChB,OAAe,EACf,SAAc,GACf,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,iBAsBA"}

package/dist/libs/cloudrun-helpers.js

@@ -44,18 +44,19 @@ export async function buildDev(image) {
     const sha = randomBytes(12).toString("hex");
     const buildDir = new CommandExecutor(`devops prep-build ${image}`, {
         env,
+        quiet: true
     }).exec().trim();
     const tag = containerRegistryRepoPath(image, env, sha);
     console.warn(`Building ${tag} from ${buildDir}`);
-    await new CommandExecutor(`docker build --platform linux/amd64 -t ${tag} ${buildDir} --build-arg MONOREPO_ENV=${env}`, { env }).spawn();
+    await new CommandExecutor(`docker build --platform linux/amd64 -t ${tag} ${buildDir} --build-arg MONOREPO_ENV=${env}`, { env }).spawn({ pipeStdoutTo: "stderr" });
     console.warn(`Pushing ${tag}`);
-    await new CommandExecutor(`docker push ${tag}`, { env }).spawn();
+    await new CommandExecutor(`docker push ${tag}`, { env }).spawn({ pipeStdoutTo: "stderr" });
     console.warn(`\n✅ Built and pushed ${tag}\n`);
     console.warn('Run "devops cloudrun deploy" next. For example:');
-    console.warn(chalk.blue(`./devops cloudrun deploy ${image} ${sha} --env ${env} --allow-unauthenticated --region us-east1 --forward-env ENV1,ENV2 --service-account RUNTIME_SA`));
+    console.warn(chalk.blue(`./devops cloudrun deploy ${image} ${sha} --env ${env} --allow-unauthenticated --region us-east1 --forward-env ENV1,ENV2 -- --service-account RUNTIME_SA`));
     console.warn(chalk.yellow(`\n\nRUNTIME_SA is the name of the service account used to run the Cloud Run service.`));
     console.warn(chalk.yellow(`Find it with "gcloud iam service-accounts list"\n`));
-    console.log(tag);
+    console.log(sha);
 }
 export async function deploy({ image, env, sha, region, forwardEnv = [], allowUnauthenticated = false, cpu = "0.25", memory = "256Mi", minInstances = 0, maxInstances = 1, timeout = "60s", extraArgs = "", }) {
     verifyCloudrunImage(image);

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

@@ -1,7 +1,7 @@
 import type { PackageData, TemplateDbMigrateObject, TemplateDebugObject, TemplateDeploymentObject, TemplateSharedContext } from "../types";
 export declare function generateImageDeployments(monorepoEnv: string, image: string, gitSha: string): string;
 export declare function generateWorkspaceDeployment(packageData: PackageData, monorepoEnv: string, image: string, gitSha: string): string;
-export declare function generateDebugDeployment(monorepoEnv: string, image: string, gitSha: string): string | undefined;
+export declare function generateDebugPod(monorepoEnv: string, image: string, gitSha: string): string | undefined;
 export declare function generateDbMigrateJob(monorepoEnv: string, image: string, gitSha: string): string;
 export declare class ImageContextGenerator {
     monorepoEnv: string;

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;AA6B3I,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,UAcf;AAED,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAOvH;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,sBASf;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,UAOf;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;AA6B3I,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,UAOvH;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,sBASf;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,UAOf;AA+FD,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

@@ -30,8 +30,7 @@ export function generateImageDeployments(monorepoEnv, image, gitSha) {
         const renderFn = (template) => Handlebars.compile(template)(context);
         return generateManifestForDeployment(projectData.rootPath, projectData.deployment.template, renderFn);
     });
-    const debug = generateDebugDeployment(monorepoEnv, image, gitSha);
-    const manifest = [debug, ...apps].filter(Boolean).join("\n---\n");
+    const manifest = apps.filter(Boolean).join("\n---\n");
     return ensureProperDomainsPresent(manifest, monorepoEnv, image);
 }
 export function generateWorkspaceDeployment(packageData, monorepoEnv, image, gitSha) {
@@ -42,7 +41,7 @@ export function generateWorkspaceDeployment(packageData, monorepoEnv, image, git
     const manifest = generateManifestForDeployment(packageData.rootPath, packageData.deployment.template, renderFn).join("\n---\n");
     return ensureProperDomainsPresent(manifest, monorepoEnv, image);
 }
-export function generateDebugDeployment(monorepoEnv, image, gitSha) {
+export function generateDebugPod(monorepoEnv, image, gitSha) {
     verifyNotCloudrunImage(image);
     const generator = new ImageContextGenerator(monorepoEnv, image, gitSha);
     const context = generator.getDebug();
@@ -50,7 +49,7 @@ export function generateDebugDeployment(monorepoEnv, image, gitSha) {
     const debugTemplate = getImageData(image)["debug-template"];
     if (!debugTemplate)
         return;
-    return generateManifestsFromTemplateName(debugTemplate, renderFn).map(x => yaml.stringify(x)).join("\n---\n");
+    return generateManifestsFromTemplateName(debugTemplate, renderFn, { validate: false }).map(x => yaml.stringify(x)).join("\n---\n");
 }
 export function generateDbMigrateJob(monorepoEnv, image, gitSha) {
     verifyNotCloudrunImage(image);
@@ -79,13 +78,13 @@ function generateManifestForDeployment(rootPath, templateName, renderFn) {
     return Object.values(mergedTemplates).map(x => yaml.stringify(x));
 }
 // L2 generation
-function generateManifestsFromTemplateName(templateName, renderFn) {
+function generateManifestsFromTemplateName(templateName, renderFn, options = { validate: true }) {
     const entries = manifestFilesForTemplate(templateName);
     if (!entries) {
         console.error(`No entries found for ${templateName} in ${MANIFEST_INDEX_FILE_PATH}`);
         process.exit(1);
     }
-    return generateManifestsFromFileList(entries.map(entry => path.join(MANIFEST_FOLDER_PATH, entry)), renderFn);
+    return generateManifestsFromFileList(entries.map(entry => path.join(MANIFEST_FOLDER_PATH, entry)), renderFn, options);
 }
 // L2 generation
 function generateManifestFromFilesInFolder(folderPath, renderFn) {
@@ -97,19 +96,21 @@ function generateManifestFromFilesInFolder(folderPath, renderFn) {
     return generateManifestsFromFileList(files, renderFn);
 }
 // L3 generation
-function generateManifestsFromFileList(filesList, renderFn) {
+function generateManifestsFromFileList(filesList, renderFn, options = { validate: true }) {
     return filesList.flatMap((filePath) => {
         try {
             const manifestFileStr = fs.readFileSync(filePath, 'utf8');
             const renderedStr = renderFn(manifestFileStr);
             const res = yaml.parseAllDocuments(renderedStr);
-            res.forEach((doc) => {
-                if (!doc.get("kind") || !doc.getIn(["metadata", "name"])) {
-                    console.error(`Invalid manifest file ${filePath}: kind and metadata.name must be present`);
-                    console.error(doc.toString());
-                    process.exit(1);
-                }
-            });
+            if (options.validate) {
+                res.forEach((doc) => {
+                    if (!doc.get("kind") || !doc.getIn(["metadata", "name"])) {
+                        console.error(`Invalid manifest file ${filePath}: kind and metadata.name must be present`);
+                        console.error(doc.toString());
+                        process.exit(1);
+                    }
+                });
+            }
             return res.map(x => x.toJSON());
         }
         catch (e) {

package/package.json

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

package/src/cli/common.ts

@@ -1,5 +1,5 @@
 import chalk from "chalk";
-import { execSync, spawn } from "child_process";
+import { execSync, spawn, type StdioOptions } from "child_process";
 import fs from "fs";
 import { globSync } from "glob";
 import { allSupportedEnvs } from "../libs/k8s-constants";
@@ -222,18 +222,23 @@ export class CommandExecutor {
   }
 
   /** Should be used for CLI commands intended to be used locally. Provides interactivity. Unlike exec(), stdout is not returned. */
-  spawn({ env = {} } = {}) {
+  spawn({ env, pipeStdoutTo }: { env?: object; pipeStdoutTo?: "stderr" } = {}) {
     this._checkEnvYamlFiles();
     const fullCommand = this._prepareFullCommand();
     const envToUse = this._getProcessEnv(env);
+    const stdio: StdioOptions = pipeStdoutTo === "stderr" ? ["inherit", "pipe", "inherit"] : "inherit";
     return new Promise((resolve) => {
       try {
         const childProcess = spawn(fullCommand, {
-          stdio: "inherit",
+          stdio,
           env: envToUse,
           shell: true,
         });
 
+        if (pipeStdoutTo === "stderr") {
+          childProcess.stdout?.pipe(process.stderr);
+        }
+
         childProcess.on("close", (code) => {
           if (code !== 0) {
             console.error(chalk.red(`Process exited with code ${code}`));

package/src/cli/core/console.ts

@@ -1,12 +1,10 @@
-import { getConst } from "../../libs/config";
-import {
-  envToNamespace,
-  imageDebugName,
-} from "../../libs/k8s-constants";
+import { generateDebugPod } from "../../libs/k8s-generate";
 import { kubectlCommand } from "../../libs/k8s-helpers";
-import { CLICommandParser, printUsageAndExit } from "../common";
+import { getImageVersion } from "../../libs/k8s-image-config";
+import { CLICommandParser, CommandExecutor, printUsageAndExit } from "../common";
+import yaml from "yaml";
 
-const oneLiner = "Get a shell into the debug pod of an image";
+const oneLiner = "Spin up a debug pod of the specified image and get a shell into it.";
 const keyExamples = `
 $ devops console main-node
 `.trim();
@@ -14,7 +12,12 @@ $ devops console main-node
 const usage = `
 ${oneLiner}
 
-Each image has a debug pod. This command gets a shell into the debug pod of the specified image.
+USAGE
+    devops console <image> [--version <version>]
+
+    Options:
+      --version <version>    The version (git SHA) of the image to use. 
+                             If not specified, the live version of the image (obtained using 'devops image version get <image>') is used.
 
 EXAMPLES
   ${keyExamples}
@@ -22,23 +25,35 @@ EXAMPLES
 
 function run(cmdObj: CLICommandParser) {
   if (cmdObj.help || cmdObj.args.length === 0) printUsageAndExit(usage);
-  const image = cmdObj.args[0];
-  const debugName = imageDebugName(image);
-  const namespace = envToNamespace(cmdObj.env);
-  const podName = cmdObj
-    .executorFromEnv(
-      kubectlCommand(`get pod -n ${namespace} -l app=${debugName} -o name`, {
-        namespace,
-      }),
-      { quiet: true }
-    )
-    .exec()
-    .trim();
-  cmdObj
-    .executorFromEnv(
-      kubectlCommand(`exec -it ${podName} -- /bin/bash`, { namespace })
-    )
-    .spawn();
+  const parsed = cmdObj.parseOptions({ params: ["--version"] });
+  if (parsed.args.length !== 1) printUsageAndExit(usage);
+  const image = parsed.args[0];
+  const version = parsed.options["--version"];
+
+  const gitSha = version ?? getImageVersion(cmdObj.env, image);
+  if (!gitSha) {
+    console.error(`No git SHA found for image ${image} in environment ${cmdObj.env}`);
+    process.exit(1);
+  }
+  const debugYaml = generateDebugPod(cmdObj.env, image, gitSha);
+  if (!debugYaml) {
+    console.error(`The image ${image} does not specify debug-template in images.yaml`);
+    process.exit(1);
+  }
+
+  const userName = new CommandExecutor(`kubectl auth whoami -o jsonpath='{.status.userInfo.username}'`).exec();
+
+  const debugManifestsJson = JSON.stringify(yaml.parse(debugYaml));
+  const randomId = Math.random().toString(36).substring(2, 10);
+  const podName = ['ephemeral-console', slugify(userName), slugify(image), randomId].filter(Boolean).join('-');
+
+  new CommandExecutor(kubectlCommand(
+    `run ${podName} --restart=Never --rm -it --image=overridden --overrides='${debugManifestsJson}'`, { monorepoEnv: cmdObj.env })
+  ).spawn();
+}
+
+function slugify(str: string, maxLength = 20) {
+  return str.toLowerCase().trim().replace(/[^a-zA-Z0-9]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '').slice(0, maxLength);
 }
 
-export const console = { oneLiner, keyExamples, run };
+export const consoleCommand = { command: 'console', oneLiner, keyExamples, run };

package/src/cli/extensions/template.ts

@@ -1,7 +1,7 @@
 import {
 } from "../../libs/k8s-image-config";
 import { CLICommandParser, printUsageAndExit, StrongParams } from "../common";
-import { generateDbMigrateJob, generateDebugDeployment, generateWorkspaceDeployment, ImageContextGenerator } from "../../libs/k8s-generate";
+import { generateDbMigrateJob, generateDebugPod, generateWorkspaceDeployment, ImageContextGenerator } from "../../libs/k8s-generate";
 import chalk from "chalk";
 import { getWorkspace } from "../../libs/discovery";
 import { getWorkspaceImages } from "../../libs/discovery/images";
@@ -130,7 +130,7 @@ const handlers = {
       const image = opts.required('workspaceOrImage');
       console.warn(chalk.green(`\nThis is a sample of generated manifests for the debug image ${image}:\n`))
       console.log(
-        generateDebugDeployment(
+        generateDebugPod(
           opts.required('env'),
           image,
           'dummy-sha'

package/src/libs/cloudrun-helpers.ts

@@ -46,7 +46,8 @@ export async function buildDev(image: string) {
   const sha = randomBytes(12).toString("hex");
 
   const buildDir = new CommandExecutor(`devops prep-build ${image}`, {
-    env,
+    env, 
+    quiet: true
   }).exec().trim();
 
   const tag = containerRegistryRepoPath(image, env, sha);
@@ -55,17 +56,17 @@ export async function buildDev(image: string) {
   await new CommandExecutor(
     `docker build --platform linux/amd64 -t ${tag} ${buildDir} --build-arg MONOREPO_ENV=${env}`,
     { env }
-  ).spawn();
+  ).spawn({ pipeStdoutTo: "stderr" });
 
   console.warn(`Pushing ${tag}`);
-  await new CommandExecutor(`docker push ${tag}`, { env }).spawn();
+  await new CommandExecutor(`docker push ${tag}`, { env }).spawn({ pipeStdoutTo: "stderr" });
 
   console.warn(`\n✅ Built and pushed ${tag}\n`);
   console.warn('Run "devops cloudrun deploy" next. For example:')
-  console.warn(chalk.blue(`./devops cloudrun deploy ${image} ${sha} --env ${env} --allow-unauthenticated --region us-east1 --forward-env ENV1,ENV2 --service-account RUNTIME_SA`));
+  console.warn(chalk.blue(`./devops cloudrun deploy ${image} ${sha} --env ${env} --allow-unauthenticated --region us-east1 --forward-env ENV1,ENV2 -- --service-account RUNTIME_SA`));
   console.warn(chalk.yellow(`\n\nRUNTIME_SA is the name of the service account used to run the Cloud Run service.`));
   console.warn(chalk.yellow(`Find it with "gcloud iam service-accounts list"\n`));
-  console.log(tag);
+  console.log(sha);
 }
 
 export async function deploy({

package/src/libs/k8s-generate.ts

@@ -41,8 +41,7 @@ export function generateImageDeployments(
       const renderFn = (template: string) => Handlebars.compile(template)(context);
       return generateManifestForDeployment(projectData.rootPath, projectData.deployment!.template, renderFn);
     });
-  const debug = generateDebugDeployment(monorepoEnv, image, gitSha);
-  const manifest = [debug, ...apps].filter(Boolean).join("\n---\n");
+  const manifest = apps.filter(Boolean).join("\n---\n");
   return ensureProperDomainsPresent(manifest, monorepoEnv, image);
 }
 
@@ -55,7 +54,7 @@ export function generateWorkspaceDeployment(packageData: PackageData, monorepoEn
   return ensureProperDomainsPresent(manifest, monorepoEnv, image);
 }
 
-export function generateDebugDeployment(
+export function generateDebugPod(
   monorepoEnv: string,
   image: string,
   gitSha: string
@@ -66,7 +65,7 @@ export function generateDebugDeployment(
   const renderFn = (template: string) => 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");
+  return generateManifestsFromTemplateName(debugTemplate, renderFn, { validate: false }).map(x => yaml.stringify(x)).join("\n---\n");
 }
 
 export function generateDbMigrateJob(
@@ -107,13 +106,13 @@ function generateManifestForDeployment(rootPath: string, templateName: string, r
 
 // L2 generation
 
-function generateManifestsFromTemplateName(templateName: string, renderFn: RenderFn): object[] {
+function generateManifestsFromTemplateName(templateName: string, renderFn: RenderFn, options: { validate: boolean } = { validate: true }): object[] {
   const entries = manifestFilesForTemplate(templateName);
   if (!entries) {
     console.error(`No entries found for ${templateName} in ${MANIFEST_INDEX_FILE_PATH}`);
     process.exit(1);
   }
-  return generateManifestsFromFileList(entries.map(entry => path.join(MANIFEST_FOLDER_PATH, entry)), renderFn);  
+  return generateManifestsFromFileList(entries.map(entry => path.join(MANIFEST_FOLDER_PATH, entry)), renderFn, options);  
 }
 
 // L2 generation
@@ -129,19 +128,21 @@ function generateManifestFromFilesInFolder(folderPath: string, renderFn: RenderF
 
 // L3 generation
 
-function generateManifestsFromFileList(filesList: string[], renderFn: RenderFn): object[] {
+function generateManifestsFromFileList(filesList: string[], renderFn: RenderFn, options: { validate: boolean } = { validate: true }): object[] {
   return filesList.flatMap((filePath) => {
     try {
       const manifestFileStr = fs.readFileSync(filePath, 'utf8');
       const renderedStr = renderFn(manifestFileStr);
       const res = yaml.parseAllDocuments(renderedStr);
-      res.forEach((doc) => {
-        if (!doc.get("kind") || !doc.getIn(["metadata", "name"])) {
-          console.error(`Invalid manifest file ${filePath}: kind and metadata.name must be present`);
-          console.error(doc.toString())
-          process.exit(1);
-        }          
-      })
+      if (options.validate) {
+        res.forEach((doc) => {
+          if (!doc.get("kind") || !doc.getIn(["metadata", "name"])) {
+            console.error(`Invalid manifest file ${filePath}: kind and metadata.name must be present`);
+            console.error(doc.toString())
+            process.exit(1);
+          }          
+        })
+      }
       return res.map(x => x.toJSON());
     } catch (e) {
       if (e instanceof Error) {

package/src/target-templates/lang-variants-common/typescript/.devops/manifests/deployment-debug.yaml.hb

@@ -1,45 +1,42 @@
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: v1
+kind: Pod
 metadata:
+  # Name and namespace should not be stated - they are provided by the runner
   labels:
     app: {{debug_pod_name}}
     env: {{monorepo_env}}
-  name: {{debug_pod_name}}
-  namespace: {{namespace}}
+    ephemeral-shell: "true"
 spec:
-  selector:
-    matchLabels:
-      app: {{debug_pod_name}}
-  template:
-    metadata:
-      labels:
-        app: {{debug_pod_name}}
-        env: {{monorepo_env}}
-    spec:
-      volumes:
+  volumes:
+    - name: secret-injection-hook
+      secret:
+        secretName: {{env_secret_name}}
+  containers:
+    - image: {{image_path}}
+      name: {{debug_pod_name}}
+      stdin: true
+      tty: true
+      command:
+      - ./node-exec.sh
+      args:
+      - /bin/bash
+      env:
+        - name: MONOREPO_ENV
+          value: {{monorepo_env}}
+        - name: MONOREPO_NAMESPACE
+          value: {{namespace}}
+        - name: IS_KUBERNETES
+          value: 'true'
+        - name: MONOREPO_BASE_SECRET
+          valueFrom:
+            secretKeyRef:
+              name: {{env_secret_name}}
+              key: {{env_base_secret_key}}
+      volumeMounts:
         - name: secret-injection-hook
-          secret:
-            secretName: {{env_secret_name}}
-      containers:
-        - image: {{image_path}}
-          name: {{debug_pod_name}}
-          env:
-            - name: MONOREPO_ENV
-              value: {{monorepo_env}}
-            - name: MONOREPO_NAMESPACE
-              value: {{namespace}}
-            - name: IS_KUBERNETES
-              value: 'true'
-            - name: MONOREPO_BASE_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: {{env_secret_name}}
-                  key: {{env_base_secret_key}}
-          volumeMounts:
-            - name: secret-injection-hook
-              mountPath: /etc/kubernetes/secrets
-              readOnly: true
-          resources:
-            requests:
-              memory: 250Mi
-              cpu: 100m
+          mountPath: /etc/kubernetes/secrets
+          readOnly: true
+      resources:
+        requests:
+          memory: 250Mi
+          cpu: 100m