@vaharoni/devops 1.1.8 → 1.1.9

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

@@ -1 +1 @@
-{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../src/cli/image.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAmC,MAAM,sBAAsB,CAAC;AAiKzF,iBAAS,GAAG,CAAC,MAAM,EAAE,gBAAgB,QA8BpC;;;;;;;;AAED,wBAEE"}
+{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../src/cli/image.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAmC,MAAM,sBAAsB,CAAC;AA6KzF,iBAAS,GAAG,CAAC,MAAM,EAAE,gBAAgB,QAgCpC;;;;;;;;AAED,wBAEE"}

package/dist/cli/image.js

@@ -2,8 +2,10 @@ import { deleteImageVersion, getImageVersion, getWorkspaceScale, resetWorkspaceS
 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 = `
+    $ devops image get        type   main-node
     $ devops image deployment gen    main-node sha  --env staging
     $ devops image deployment create main-node sha  --env staging
     $ devops image deployment delete main-node      --env staging
@@ -19,6 +21,11 @@ const keyExamples = `
 const usage = `
 ${oneLiner}
 
+GET IMAGE TYPE
+    devops image get type <image-name>
+
+    Returns "k8s" or "cloudrun" depending on the image type.
+
 GENERATING DEPLOYMENT MANIFESTS
     devops image deployment gen|create|delete <image-name> <sha>
 
@@ -46,6 +53,11 @@ EXAMPLES
     ${keyExamples}
 `;
 const handlers = {
+    get: {
+        type: (opts) => {
+            console.log(getImageType(opts.required("image")));
+        },
+    },
     deployment: {
         gen: (opts) => {
             console.log(generateImageDeployments(opts.required("env"), opts.required("image"), opts.required("sha")));
@@ -120,7 +132,10 @@ function run(cmdObj) {
         printUsageAndExit(usage);
     }
     function getExtraParams() {
-        if (command === 'scale') {
+        if (command === 'get') {
+            return {};
+        }
+        else if (command === 'scale') {
             return subcommand === 'set' ? { workspace: param1, replicas: param2 } : { workspace: param1 };
         }
         else {

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;AA6D7E,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;AA8D7E,iBAAS,GAAG,CAAC,MAAM,EAAE,gBAAgB,QAYpC;;;;;;;;AAED,wBAEE"}

package/dist/cli/registry.js

@@ -45,8 +45,9 @@ const handlers = {
     },
     prune: (opts) => {
         const regName = containerRegistryPath();
-        const repoName = containerRegistryImageName(opts.required("image"), opts.required("env"));
-        prune(regName, repoName);
+        const image = opts.required("image");
+        const repoName = containerRegistryImageName(image, opts.required("env"));
+        prune(regName, repoName, image);
     },
 };
 function run(cmdObj) {

package/dist/libs/config.d.ts

@@ -3,4 +3,5 @@ export declare const getConst: <T extends keyof ConstFileSchema>(key: T, opts?:
     ignoreIfInvalid?: boolean;
 }) => ConstFileSchema[T] | undefined;
 export declare const getImageData: (imageName: string) => SingleImageSchema, getImageNames: () => string[], getTemplateData: (templateName: string) => SingleTemplateSchema;
+export declare function getImageType(image: string): "cloudrun" | "k8s";
 //# sourceMappingURL=config.d.ts.map

package/dist/libs/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/libs/config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAoC,KAAK,eAAe,EAAwB,KAAK,iBAAiB,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAM3J,eAAO,MAAQ,QAAQ,GA2BH,CAAC,SAAS,MAAM,eAAe,OAAO,CAAC,SAAQ;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,KAAQ,eAAe,CAAC,CAAC,CAAC,GAAG,SAAS,AA3BxF,CAAC;AAC/C,eAAO,MAAQ,YAAY,cAkEQ,MAAM,KAAG,iBAAiB,EAlEhC,aAAa,kBAAE,eAAe,iBAwFlB,MAAM,KAAG,oBAAoB,AAxFa,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/libs/config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAoC,KAAK,eAAe,EAAwB,KAAK,iBAAiB,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAM3J,eAAO,MAAQ,QAAQ,GAgCH,CAAC,SAAS,MAAM,eAAe,OAAO,CAAC,SAAQ;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,KAAQ,eAAe,CAAC,CAAC,CAAC,GAAG,SAAS,AAhCxF,CAAC;AAC/C,eAAO,MAAQ,YAAY,cAuEQ,MAAM,KAAG,iBAAiB,EAvEhC,aAAa,kBAAE,eAAe,iBA6FlB,MAAM,KAAG,oBAAoB,AA7Fa,CAAC;AAEpF,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,sBAGzC"}

package/dist/libs/config.js

@@ -8,6 +8,10 @@ const imagesFilePath = path.join(process.cwd(), ".devops/config/images.yaml");
 // We want these to be lazy loaded so that calling devops in a context that does not need the config files won't fail
 export const { getConst } = processConstFile();
 export const { getImageData, getImageNames, getTemplateData } = processImagesFile();
+export function getImageType(image) {
+    const imageData = getImageData(image);
+    return imageData["cloudrun"] ? "cloudrun" : "k8s";
+}
 // Process config/constants.yaml
 function processConstFile() {
     let constants;

package/dist/libs/digital-ocean/container-reg.d.ts

@@ -2,5 +2,5 @@ export declare function prune(
 /** To keep the image-related constants simple, this accepts the full URL including the prefix registry.digitalocean.com */
 registryFullName: string, 
 /** The name of the repository inside the registry */
-repoName: string): void;
+repoName: string, image: string): void;
 //# sourceMappingURL=container-reg.d.ts.map

package/dist/libs/digital-ocean/container-reg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container-reg.d.ts","sourceRoot":"","sources":["../../../src/libs/digital-ocean/container-reg.ts"],"names":[],"mappings":"AA0DA,wBAAgB,KAAK;AACnB,2HAA2H;AAC3H,gBAAgB,EAAE,MAAM;AACxB,qDAAqD;AACrD,QAAQ,EAAE,MAAM,QAkBjB"}
+{"version":3,"file":"container-reg.d.ts","sourceRoot":"","sources":["../../../src/libs/digital-ocean/container-reg.ts"],"names":[],"mappings":"AA0DA,wBAAgB,KAAK;AACnB,2HAA2H;AAC3H,gBAAgB,EAAE,MAAM;AACxB,qDAAqD;AACrD,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,QAyBd"}

package/dist/libs/digital-ocean/container-reg.js

@@ -1,6 +1,6 @@
 import { CommandExecutor } from "../../cli/common";
 import { z } from "zod";
-import { getConst } from "../config";
+import { getConst, getImageData } from "../config";
 const repoTagMetadataSchema = z.object({
     // What we rely on
     tag: z.string().optional(),
@@ -50,12 +50,17 @@ export function prune(
 /** To keep the image-related constants simple, this accepts the full URL including the prefix registry.digitalocean.com */
 registryFullName, 
 /** The name of the repository inside the registry */
-repoName) {
+repoName, image) {
     const infra = getConst("infra");
     if (infra !== "digitalocean") {
         console.warn("Pruning is only supported for the DigitalOcean container registry");
         return;
     }
+    const imageData = getImageData(image);
+    if (imageData["cloudrun"]) {
+        console.warn("Pruning is skipped for cloudrun images");
+        return;
+    }
     const tags = getRepoTagMetadata(repoName);
     const versionsToKeep = Number(getConst("image-versions-to-keep"));
     if (!tags.length || tags.length <= versionsToKeep)

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,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"}
+{"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"}

package/dist/libs/k8s-generate.js

@@ -12,8 +12,16 @@ import { getImageDescendentData } from "./discovery/images";
 const MANIFEST_FOLDER_PATH = path.join(process.cwd(), '.devops/manifests');
 const MANIFEST_INDEX_FILE_PATH = path.join(MANIFEST_FOLDER_PATH, '_index.yaml');
 const DB_MIGRATE_TEMPLATE_NAME = 'db-migrate';
+function verifyNotCloudrunImage(image) {
+    const imageData = getImageData(image);
+    if (imageData["cloudrun"]) {
+        console.error(`Image ${image} is a cloudrun image. Cloudrun images are not supported for k8s generation`);
+        process.exit(1);
+    }
+}
 // = Interface
 export function generateImageDeployments(monorepoEnv, image, gitSha) {
+    verifyNotCloudrunImage(image);
     const generator = new ImageContextGenerator(monorepoEnv, image, gitSha);
     const apps = getImageDescendentData(image)
         .filter((packageData) => packageData.deployment)
@@ -27,6 +35,7 @@ export function generateImageDeployments(monorepoEnv, image, gitSha) {
     return ensureProperDomainsPresent(manifest, monorepoEnv, image);
 }
 export function generateWorkspaceDeployment(packageData, monorepoEnv, image, gitSha) {
+    verifyNotCloudrunImage(image);
     const generator = new ImageContextGenerator(monorepoEnv, image, gitSha);
     const context = generator.getDeployment(packageData);
     const renderFn = (template) => Handlebars.compile(template)(context);
@@ -34,6 +43,7 @@ export function generateWorkspaceDeployment(packageData, monorepoEnv, image, git
     return ensureProperDomainsPresent(manifest, monorepoEnv, image);
 }
 export function generateDebugDeployment(monorepoEnv, image, gitSha) {
+    verifyNotCloudrunImage(image);
     const generator = new ImageContextGenerator(monorepoEnv, image, gitSha);
     const context = generator.getDebug();
     const renderFn = (template) => Handlebars.compile(template)(context);
@@ -43,6 +53,7 @@ export function generateDebugDeployment(monorepoEnv, image, gitSha) {
     return generateManifestsFromTemplateName(debugTemplate, renderFn).map(x => yaml.stringify(x)).join("\n---\n");
 }
 export function generateDbMigrateJob(monorepoEnv, image, gitSha) {
+    verifyNotCloudrunImage(image);
     const generator = new ImageContextGenerator(monorepoEnv, image, gitSha);
     const context = generator.getDbMigrate();
     const renderFn = (template) => Handlebars.compile(template)(context);

package/package.json

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

package/src/cli/image.ts

@@ -2,9 +2,11 @@ import { deleteImageVersion, getImageVersion, getWorkspaceScale, resetWorkspaceS
 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 = `
+    $ devops image get        type   main-node
     $ devops image deployment gen    main-node sha  --env staging
     $ devops image deployment create main-node sha  --env staging
     $ devops image deployment delete main-node      --env staging
@@ -21,6 +23,11 @@ const keyExamples = `
 const usage = `
 ${oneLiner}
 
+GET IMAGE TYPE
+    devops image get type <image-name>
+
+    Returns "k8s" or "cloudrun" depending on the image type.
+
 GENERATING DEPLOYMENT MANIFESTS
     devops image deployment gen|create|delete <image-name> <sha>
 
@@ -49,6 +56,11 @@ EXAMPLES
 `;
 
 const handlers = {
+  get: {
+    type: (opts: StrongParams) => {
+      console.log(getImageType(opts.required("image")));
+    },
+  },
   deployment: {
     gen: (opts: StrongParams) => {
       console.log(
@@ -176,7 +188,9 @@ function run(cmdObj: CLICommandParser) {
   }
 
   function getExtraParams() {
-    if (command === 'scale') {
+    if (command === 'get') {
+      return {};
+    } else if (command === 'scale') {
       return subcommand === 'set' ? { workspace: param1, replicas: param2 } : { workspace: param1 };
     } else {
       return { sha: param1 };

package/src/cli/registry.ts

@@ -58,11 +58,12 @@ const handlers = {
   },
   prune: (opts: StrongParams) => {
     const regName = containerRegistryPath();
+    const image = opts.required("image");
     const repoName = containerRegistryImageName(
-      opts.required("image"),
+      image,
       opts.required("env")
     );
-    prune(regName, repoName);
+    prune(regName, repoName, image);
   },
 };
 

package/src/libs/config.ts

@@ -11,6 +11,11 @@ const imagesFilePath = path.join(process.cwd(), ".devops/config/images.yaml");
 export const { getConst } = processConstFile();
 export const { getImageData, getImageNames, getTemplateData } = processImagesFile();
 
+export function getImageType(image: string) {
+  const imageData = getImageData(image);
+  return imageData["cloudrun"] ? "cloudrun" : "k8s";
+}
+
 // Process config/constants.yaml
 
 function processConstFile() {

package/src/libs/digital-ocean/container-reg.ts

@@ -1,6 +1,6 @@
 import { CommandExecutor } from "../../cli/common";
 import { z } from "zod";
-import { getConst } from "../config";
+import { getConst, getImageData } from "../config";
 
 const repoTagMetadataSchema = z.object({
   // What we rely on
@@ -60,7 +60,8 @@ export function prune(
   /** To keep the image-related constants simple, this accepts the full URL including the prefix registry.digitalocean.com */
   registryFullName: string,
   /** The name of the repository inside the registry */
-  repoName: string
+  repoName: string,
+  image: string
 ) {
   const infra = getConst("infra");
   if (infra !== "digitalocean") {
@@ -69,6 +70,13 @@ export function prune(
     );
     return;
   }
+  const imageData = getImageData(image);
+  if (imageData["cloudrun"]) {
+    console.warn(
+      "Pruning is skipped for cloudrun images"
+    );
+    return;
+  }
   const tags = getRepoTagMetadata(repoName);
   const versionsToKeep = Number(getConst("image-versions-to-keep"));
   if (!tags.length || tags.length <= versionsToKeep) return;

package/src/libs/k8s-generate.ts

@@ -17,6 +17,14 @@ const DB_MIGRATE_TEMPLATE_NAME = 'db-migrate';
 
 type RenderFn = (template: string) => string;
 
+function verifyNotCloudrunImage(image: string) {
+  const imageData = getImageData(image);
+  if (imageData["cloudrun"]) {
+    console.error(`Image ${image} is a cloudrun image. Cloudrun images are not supported for k8s generation`);
+    process.exit(1);
+  }
+}
+
 // = Interface
 
 export function generateImageDeployments(
@@ -24,6 +32,7 @@ export function generateImageDeployments(
   image: string,
   gitSha: string
 ) {
+  verifyNotCloudrunImage(image);
   const generator = new ImageContextGenerator(monorepoEnv, image, gitSha);
   const apps = getImageDescendentData(image)
     .filter((packageData) => packageData.deployment)
@@ -38,6 +47,7 @@ export function generateImageDeployments(
 }
 
 export function generateWorkspaceDeployment(packageData: PackageData, monorepoEnv: string, image: string, gitSha: string) {
+  verifyNotCloudrunImage(image);
   const generator = new ImageContextGenerator(monorepoEnv, image, gitSha);
   const context = generator.getDeployment(packageData);
   const renderFn = (template: string) => Handlebars.compile(template)(context);
@@ -50,6 +60,7 @@ export function generateDebugDeployment(
   image: string,
   gitSha: string
 ) {
+  verifyNotCloudrunImage(image);
   const generator = new ImageContextGenerator(monorepoEnv, image, gitSha);
   const context = generator.getDebug();
   const renderFn = (template: string) => Handlebars.compile(template)(context);
@@ -63,6 +74,7 @@ export function generateDbMigrateJob(
   image: string,
   gitSha: string
 ) {
+  verifyNotCloudrunImage(image);
   const generator = new ImageContextGenerator(monorepoEnv, image, gitSha);
   const context = generator.getDbMigrate();
   const renderFn = (template: string) => Handlebars.compile(template)(context);