@vaharoni/devops 1.1.7 → 1.1.8

package/README.md

@@ -29,7 +29,6 @@ Currently, the repo works with `bun` as the package manager for node and `uv` fo
 Run this in your local copy of the devops folder:
 ```shell
 bun link
-bun run build
 ```
 
 Run this in a local package using the project for testing:
@@ -37,6 +36,11 @@ Run this in a local package using the project for testing:
 bun link @vaharoni/devops
 ```
 
+After changes you make in this local repo, run:
+```shell
+bun run build
+```
+
 When done:
 ```shell
 # In the local copy of this repo

package/dist/cli/cloudrun.d.ts

@@ -0,0 +1,11 @@
+import { CLICommandParser } from "./common";
+declare function run(cmdObj: CLICommandParser): Promise<void>;
+declare const _default: {
+    cloudrun: {
+        oneLiner: string;
+        keyExamples: string;
+        run: typeof run;
+    };
+};
+export default _default;
+//# sourceMappingURL=cloudrun.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cloudrun.d.ts","sourceRoot":"","sources":["../../src/cli/cloudrun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAmC,MAAM,UAAU,CAAC;AA6E7E,iBAAe,GAAG,CAAC,MAAM,EAAE,gBAAgB,iBAmD1C;;;;;;;;AAED,wBAEE"}

package/dist/cli/cloudrun.js

@@ -0,0 +1,121 @@
+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) => {
+        buildDev(opts.required("image"));
+    },
+    _deploy: (opts) => {
+        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"),
+        });
+    },
+};
+async function run(cmdObj) {
+    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];
+    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/dist/cli/common.d.ts

@@ -1,9 +1,7 @@
-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[];
 };
 export declare class CLICommandParser {
@@ -15,20 +13,20 @@ export declare class CLICommandParser {
     skipEnvCheck: boolean;
     constructor(cmdArray: string[]);
     executorFromEnv(commandStr: string, options?: Omit<CommandExecutorOptions, "env">): CommandExecutor;
-    parseOptions({ params, booleans, passthroughArgs, }?: {
+    parseOptions<const TBoolKeys extends readonly string[], const TParamKeys extends readonly string[]>({ params, booleans, passthroughArgs, }?: {
         /** 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>;
     _validateEnv(env: string): boolean;
-    _separateOptions(args: string[], { params, booleans, passthroughArgs, }?: {
-        params?: string[];
-        booleans?: string[];
+    _separateOptions<const TBoolKeys extends readonly string[], const TParamKeys extends readonly string[]>(args: string[], { params, booleans, passthroughArgs, }?: {
+        params?: TParamKeys;
+        booleans?: TBoolKeys;
         passthroughArgs?: boolean;
-    }): ParsedArgs;
+    }): ParsedArgs<TBoolKeys, TParamKeys>;
 }
 type CommandExecutorOptions = {
     env?: string;

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

@@ -47,7 +47,7 @@ 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 = [], passthroughArgs = false, } = {}) {
+    parseOptions({ params, booleans, passthroughArgs = false, } = {}) {
         return this._separateOptions(this.args, {
             params,
             booleans,
@@ -63,36 +63,42 @@ export class CLICommandParser {
         }
         return true;
     }
-    _separateOptions(args, { params = [], booleans = [], passthroughArgs = false, } = {}) {
-        const results = {
-            args: [],
-            argsStr: "",
-            options: {},
-            ...(passthroughArgs ? { passthrough: [] } : {}),
-        };
-        const paramsLookup = Object.fromEntries(params.map((x) => [x, true]));
-        const booleansLookup = Object.fromEntries(booleans.map((x) => [x, true]));
+    _separateOptions(args, { params, booleans, passthroughArgs = false, } = {}) {
+        const paramsLookup = new Set(params ?? []);
+        const booleansLookup = new Set(booleans ?? []);
+        const isParam = (arg) => paramsLookup.has(arg);
+        const isBoolean = (arg) => booleansLookup.has(arg);
         const passthroughArgsStart = passthroughArgs ? args.indexOf("--") : -1;
+        // 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 = [];
+        const resParams = {};
+        const resOptions = {};
         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(),
+        };
     }
 }
 export class CommandExecutor {
@@ -144,10 +150,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) => {
                     if (code !== 0) {

package/dist/cli/env.js

@@ -1,5 +1,5 @@
 import { globSync } from "glob";
-import { deleteMonorepoSecret, getMonorepoSecret, setMonorepoSecret, } from "../libs/k8s-secrets-manager";
+import { deleteMonorepoSecret, getMonorepoSecretStr, setMonorepoSecret, } from "../libs/k8s-secrets-manager";
 import { CombinedEnvValidator } from "../libs/validate-env";
 import { CLICommandParser, dotEnvFilesForEnv, printUsageAndExit, } from "./common";
 const oneLiner = "Commands to manipulate env variables";
@@ -46,7 +46,7 @@ function run(cmdObj) {
             break;
         }
         case "get": {
-            console.log(getMonorepoSecret(cmdObj.env, rest));
+            console.log(getMonorepoSecretStr(cmdObj.env, rest));
             break;
         }
         case "set": {

package/dist/cli/prep-build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prep-build.d.ts","sourceRoot":"","sources":["../../src/cli/prep-build.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,UAAU,CAAC;AAqB/D,iBAAe,GAAG,CAAC,MAAM,EAAE,gBAAgB,iBAmE1C;;;;;;;;AAED,wBAEE"}
+{"version":3,"file":"prep-build.d.ts","sourceRoot":"","sources":["../../src/cli/prep-build.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,UAAU,CAAC;AA0B/D,iBAAe,GAAG,CAAC,MAAM,EAAE,gBAAgB,iBA0F1C;;;;;;;;AAED,wBAEE"}

package/dist/cli/prep-build.js

@@ -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";
 const keyExamples = `
     $ devops prep-build main-node
@@ -13,7 +15,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}
@@ -52,16 +57,40 @@ async function run(cmdObj) {
         console.warn(`COPYING Docker common`);
         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"));
     fs.copySync(".devops/config", path.join(destFolder, ".devops/config"));
     // 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) => {
         console.warn(`COPYING ${project.rootPath}`);

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

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/cli/registry.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAmC,MAAM,UAAU,CAAC;AAoD7E,iBAAS,GAAG,CAAC,MAAM,EAAE,gBAAgB,QAYpC;;;;;;;;AAED,wBAEE"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/cli/registry.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAmC,MAAM,UAAU,CAAC;AA6D7E,iBAAS,GAAG,CAAC,MAAM,EAAE,gBAAgB,QAYpC;;;;;;;;AAED,wBAEE"}

package/dist/cli/registry.js

@@ -6,20 +6,26 @@ const oneLiner = "Manage container repositories";
 const keyExamples = `
     $ devops registry server-url
     $ devops registry reg-url
-    $ devops registry repo-url my-image sha
-    $ devops registry prune    my-image
+    $ devops registry repo-url   my-image sha
+    $ devops registry image-name my-image 
+    $ devops registry prune      my-image
 `.trim();
 const usage = `
 ${oneLiner}
 
 USAGE
-  Get base URLs
+  Get base URLs for the container registry of the cluster:
       devops registry server-url
       devops registry reg-url
 
+      Note: for cloudrun images these URLs are not relevant. 
+
   Gets the URL of an image in the container registry:
     devops registry repo-url <image> <sha> --env <env>
 
+  Gets the image name in the container registry:
+    devops registry image-name <image> --env <env>
+
   Prunes the repository of old images to enforce the "image-versions-to-keep" constant in config/constants.yaml:
     devops registry prune <image> --env <env>
 
@@ -34,6 +40,9 @@ const handlers = {
     "repo-url": (opts) => {
         console.log(containerRegistryRepoPath(opts.required("image"), opts.required("env"), opts.required("sha")));
     },
+    "image-name": (opts) => {
+        console.log(containerRegistryImageName(opts.required("image"), opts.required("env")));
+    },
     prune: (opts) => {
         const regName = containerRegistryPath();
         const repoName = containerRegistryImageName(opts.required("image"), opts.required("env"));

package/dist/devops.js

@@ -22,6 +22,7 @@ import namespace from "./cli/namespace";
 import image from "./cli/image";
 import template from "./cli/template";
 import job from "./cli/job";
+import cloudrun from "./cli/cloudrun";
 const [_node, _scriptPath, ...commandArgs] = process.argv;
 const allImports = [
     // day-to-day
@@ -43,11 +44,12 @@ const allImports = [
     job,
     //= Deployment
     prepBuild,
+    cloudrun,
     affected,
     constant,
     registry,
     internalCurl,
-    jwt
+    jwt,
 ];
 const commands = {};
 allImports.forEach((imported) => {

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

@@ -0,0 +1,16 @@
+export declare function buildDev(image: string): Promise<void>;
+export declare function deploy({ image, env, sha, region, forwardEnv, allowUnauthenticated, cpu, memory, minInstances, maxInstances, timeout, extraArgs, }: {
+    image: string;
+    env: string;
+    sha: string;
+    region: string;
+    forwardEnv?: string[];
+    allowUnauthenticated?: boolean;
+    cpu?: string;
+    memory?: string;
+    minInstances?: number;
+    maxInstances?: number;
+    timeout?: string;
+    extraArgs?: string;
+}): Promise<void>;
+//# sourceMappingURL=cloudrun-helpers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cloudrun-helpers.d.ts","sourceRoot":"","sources":["../../src/libs/cloudrun-helpers.ts"],"names":[],"mappings":"AA0CA,wBAAsB,QAAQ,CAAC,KAAK,EAAE,MAAM,iBAyB3C;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

@@ -0,0 +1,79 @@
+import { randomBytes } from "crypto";
+import { CommandExecutor } from "../cli/common";
+import { containerRegistryRepoPath, isLocalOrRemoteEnv } from "./k8s-constants";
+import { getImageData } from "./config";
+import { getMonorepoSecretObject } from "./k8s-secrets-manager";
+import chalk from "chalk";
+function verifyCloudrunImage(image) {
+    const imageData = getImageData(image);
+    if (!imageData["cloudrun"]) {
+        console.error(`Image ${image} is not a cloudrun image. Add "cloudrun: true" in images.yaml`);
+        process.exit(1);
+    }
+}
+function getEnvValuesToForward(env, forwardEnv) {
+    if (!forwardEnv.length)
+        return {};
+    let envValues = {};
+    const missingValues = new Set();
+    for (const key of forwardEnv) {
+        const value = process.env[key];
+        if (value) {
+            envValues[key] = value;
+        }
+        else {
+            missingValues.add(key);
+        }
+    }
+    if (missingValues.size > 0 && isLocalOrRemoteEnv(env) === "remote") {
+        const secretsFromCluster = getMonorepoSecretObject(env, Array.from(missingValues));
+        for (const key of Object.keys(secretsFromCluster)) {
+            envValues[key] = secretsFromCluster[key];
+            missingValues.delete(key);
+        }
+    }
+    if (missingValues.size > 0) {
+        console.error(`Some forwardEnv variables are missing: ${Array.from(missingValues).join(", ")}`);
+        process.exit(1);
+    }
+    return envValues;
+}
+export async function buildDev(image) {
+    verifyCloudrunImage(image);
+    const env = "development";
+    const sha = randomBytes(12).toString("hex");
+    const buildDir = new CommandExecutor(`devops prep-build ${image}`, {
+        env,
+    }).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();
+    console.warn(`Pushing ${tag}`);
+    await new CommandExecutor(`docker push ${tag}`, { env }).spawn();
+    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`));
+    console.warn();
+    console.log(tag);
+}
+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);
+    const repoPath = containerRegistryRepoPath(image, env, sha);
+    const envValues = getEnvValuesToForward(env, forwardEnv);
+    const envValuesCsv = Object.entries(envValues).map(([key, value]) => `${key}="${value}"`).join(",");
+    const serviceName = `${image}-${env}`;
+    const cmd = `
+    gcloud run deploy ${serviceName} 
+      --image ${repoPath} 
+      ${Object.keys(envValues).length > 0 ? `--set-env-vars ${envValuesCsv}` : ""} 
+      ${allowUnauthenticated ? "--allow-unauthenticated" : ""}
+      --region ${region}
+      --cpu ${cpu}
+      --memory ${memory}
+      --min-instances ${minInstances}
+      --max-instances ${maxInstances}
+      --timeout ${timeout}
+      ${extraArgs}
+  `.trim().replace(/\s+/g, " ");
+    await new CommandExecutor(cmd, { env }).spawn();
+}

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

@@ -1,5 +1,6 @@
 export declare const MISSING_DOMAIN_KEY_ERROR = "$$$MISSING_DOMAIN_KEY$$$";
 export declare function allSupportedEnvs(): string[];
+export declare function isLocalOrRemoteEnv(monorepoEnv: string): "local" | "remote";
 export declare function envToNamespace(monorepoEnv?: string): string;
 export declare function secretName(): string;
 export declare function imageDebugName(image: string): string;

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

@@ -1 +1 @@
-{"version":3,"file":"k8s-constants.d.ts","sourceRoot":"","sources":["../../src/libs/k8s-constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,wBAAwB,6BAA6B,CAAA;AAoBlE,wBAAgB,gBAAgB,aAE/B;AAYD,wBAAgB,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,UAGlD;AAED,wBAAgB,UAAU,WAEzB;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,UAE3C;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,UAE3C;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAG5E;AAED,wBAAgB,qBAAqB,WAEpC;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,UAOf;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAIlE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,UAE9C"}
+{"version":3,"file":"k8s-constants.d.ts","sourceRoot":"","sources":["../../src/libs/k8s-constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,wBAAwB,6BAA6B,CAAA;AAoBlE,wBAAgB,gBAAgB,aAE/B;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,CAI1E;AAqBD,wBAAgB,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,UAGlD;AAED,wBAAgB,UAAU,WAEzB;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,UAE3C;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,UAE3C;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAG5E;AAED,wBAAgB,qBAAqB,WAEpC;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,UAgBf;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAIlE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,UAE9C"}

package/dist/libs/k8s-constants.js

@@ -21,12 +21,27 @@ function localSupportedEnvs() {
 export function allSupportedEnvs() {
     return [...remoteSupportedEnvs(), ...localSupportedEnvs()];
 }
-function validateEnv(monorepoEnv) {
+export function isLocalOrRemoteEnv(monorepoEnv) {
+    if (remoteSupportedEnvs().includes(monorepoEnv))
+        return "remote";
+    if (localSupportedEnvs().includes(monorepoEnv))
+        return "local";
+    throw new Error(`Unsupported environment: ${monorepoEnv}`);
+}
+function validateEnv(monorepoEnv, { allowLocal = false } = {}) {
     if (!monorepoEnv)
         throw new Error("MONOREPO_ENV cannot be empty");
-    if (!remoteSupportedEnvs().includes(monorepoEnv)) {
-        console.error(`MONOREPO_ENV must be one of: ${remoteSupportedEnvs().join(", ")}. Can be set using --env flag.`);
-        process.exit(1);
+    if (allowLocal) {
+        if (!allSupportedEnvs().includes(monorepoEnv)) {
+            console.error(`MONOREPO_ENV must be one of: ${allSupportedEnvs().join(", ")}. Can be set using --env flag.`);
+            process.exit(1);
+        }
+    }
+    else {
+        if (!remoteSupportedEnvs().includes(monorepoEnv)) {
+            console.error(`MONOREPO_ENV must be one of: ${remoteSupportedEnvs().join(", ")}. Can be set using --env flag.`);
+            process.exit(1);
+        }
     }
 }
 export function envToNamespace(monorepoEnv) {
@@ -43,18 +58,28 @@ export function imageConfigMap(image) {
     return `image-config-${image}`;
 }
 export function containerRegistryImageName(image, monorepoEnv) {
-    validateEnv(monorepoEnv);
+    validateEnv(monorepoEnv, { allowLocal: true });
     return `${getConst("project-name")}-${monorepoEnv}-${image}`;
 }
 export function containerRegistryPath() {
     return [getConst("registry-base-url"), getConst("registry-image-path-prefix", { ignoreIfInvalid: true })].filter(Boolean).join("/");
 }
 export function containerRegistryRepoPath(image, monorepoEnv, gitSha) {
-    return [
-        getConst("registry-base-url"),
-        getConst("registry-image-path-prefix", { ignoreIfInvalid: true }),
-        [containerRegistryImageName(image, monorepoEnv), gitSha].join(":"),
-    ].filter(Boolean).join("/");
+    const imageNameAndTag = [containerRegistryImageName(image, monorepoEnv), gitSha].join(":");
+    const imageData = getImageData(image);
+    if (imageData["cloudrun"]) {
+        return [
+            getConst("cloudrun-artifact-registry-repo-path"),
+            imageNameAndTag,
+        ].join("/");
+    }
+    else {
+        return [
+            getConst("registry-base-url"),
+            getConst("registry-image-path-prefix", { ignoreIfInvalid: true }),
+            imageNameAndTag,
+        ].filter(Boolean).join("/");
+    }
 }
 export function domainNameForEnv(image, monorepoEnv) {
     const imageData = getImageData(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;
+export declare function generateDebugDeployment(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;