@vaharoni/devops 1.2.6 → 1.2.8

package/dist/cli/common.js

@@ -1,8 +1,8 @@
 import chalk from "chalk";
 import { execSync, spawn } from "child_process";
 import fs from "fs";
-import { globSync } from "glob";
 import { allSupportedEnvs } from "../libs/k8s-constants";
+import { globEnvYamlFiles } from "../libs/discovery";
 export class CLICommandParser {
     command;
     args;
@@ -207,7 +207,7 @@ export class CommandExecutor {
     _checkEnvYamlFiles() {
         if (!this.checkEnvYaml)
             return;
-        const envYamlFiles = globSync("**/env.yaml");
+        const envYamlFiles = globEnvYamlFiles();
         const checkEnvCmd = new CommandExecutor(`devops env _validate ${envYamlFiles.join(" ")}`, { env: this.env, quiet: true, checkEnvYaml: false });
         checkEnvCmd.exec();
     }

package/dist/cli/core/env.js

@@ -1,6 +1,6 @@
-import { globSync } from "glob";
 import { deleteMonorepoSecret, getMonorepoSecretStr, setMonorepoSecret, } from "../../libs/k8s-secrets-manager";
 import { CombinedEnvValidator } from "../../libs/validate-env";
+import { globEnvYamlFiles } from "../../libs/discovery";
 import { CLICommandParser, dotEnvFilesForEnv, printUsageAndExit, } from "../common";
 const oneLiner = "Commands to manipulate env variables";
 const keyExamples = `
@@ -28,7 +28,7 @@ function run(cmdObj) {
     const [command, ...rest] = cmdObj.args;
     switch (command) {
         case "validate": {
-            const envYamlFiles = globSync("**/env.yaml");
+            const envYamlFiles = globEnvYamlFiles();
             // We have to have a _validate so that we go through a CommandExecutor which injects env variables into the process
             cmdObj
                 .executorFromEnv(`devops env _validate ${envYamlFiles.join(" ")}`, { quiet: false })

package/dist/libs/discovery/index.d.ts

@@ -2,4 +2,5 @@ import type { SupportedLanguages, WorkspaceIndex } from "../../types";
 export declare function workspaces(): WorkspaceIndex;
 export declare function workspaceDirectoryForLanguage(language: SupportedLanguages): Record<string, import("../..").PackageData>;
 export declare function getWorkspace(workspaceName: string): import("../..").WorkspaceIndexEntry;
+export declare function globEnvYamlFiles(): string[];
 //# sourceMappingURL=index.d.ts.map

package/dist/libs/discovery/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/libs/discovery/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAKtE,wBAAgB,UAAU,mBA8BzB;AAED,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,kBAAkB,+CASzE;AAED,wBAAgB,YAAY,CAAC,aAAa,EAAE,MAAM,uCAQjD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/libs/discovery/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAOtE,wBAAgB,UAAU,mBA8BzB;AAED,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,kBAAkB,+CASzE;AAED,wBAAgB,YAAY,CAAC,aAAa,EAAE,MAAM,uCAQjD;AAED,wBAAgB,gBAAgB,IAAI,MAAM,EAAE,CAQ3C"}

package/dist/libs/discovery/index.js

@@ -1,6 +1,9 @@
 import chalk from "chalk";
+import { globSync } from "glob";
+import path from "path";
 import { nodeWorkspaces } from "./process-package-json";
 import { pythonWorkspaces } from "./process-pyproject-toml";
+const rootPath = process.env.MONOREPO_ROOT || process.cwd();
 const _workspaces = {};
 let _workspacesLoaded = false;
 export function workspaces() {
@@ -53,3 +56,10 @@ export function getWorkspace(workspaceName) {
     }
     return workspace;
 }
+export function globEnvYamlFiles() {
+    const allWorkspaces = workspaces();
+    const workspacePaths = [
+        ...new Set(Object.values(allWorkspaces).map((w) => w.rootPath)),
+    ];
+    return workspacePaths.flatMap((wsPath) => globSync(path.join(rootPath, wsPath, "**/env.yaml")));
+}

package/dist/libs/discovery/process-pyproject-toml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"process-pyproject-toml.d.ts","sourceRoot":"","sources":["../../../src/libs/discovery/process-pyproject-toml.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AASxE,wBAAgB,gBAAgB,gCAqC/B"}
+{"version":3,"file":"process-pyproject-toml.d.ts","sourceRoot":"","sources":["../../../src/libs/discovery/process-pyproject-toml.ts"],"names":[],"mappings":"AAGA,OAAO,EAA2B,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAUxE,wBAAgB,gBAAgB,gCAkD/B"}

package/dist/libs/discovery/process-pyproject-toml.js

@@ -1,40 +1,49 @@
 import chalk from "chalk";
+import fs from "fs";
 import { globSync } from "glob";
 import { packageFilePythonSchema } from "../../types";
 import { PackageDataProcessor } from "./process-common";
 import TOML from "@iarna/toml";
 import path from "path";
 const rootPath = process.env.MONOREPO_ROOT || process.cwd();
+const rootPyprojectPath = path.join(rootPath, "pyproject.toml");
 const _workspaces = {};
 let _workspacesLoaded = false;
 export function pythonWorkspaces() {
-    if (!_workspacesLoaded) {
-        const allPyprojectTomls = globSync(path.join(rootPath, "**/*/pyproject.toml"));
-        const processor = new PackageDataProcessor({
-            language: "python",
-            pathList: allPyprojectTomls,
-            zodSchema: packageFilePythonSchema,
-            fileParser: TOML.parse,
-            nameExtractor: (data) => data.project.name,
-        });
-        processor
-            .convert((data) => {
-            const deployment = data.tool?.devops?.deployment;
-            const scripts = data.tool?.devops?.scripts;
-            const dependencyNames = data.project.dependencies ?? [];
-            return {
-                scripts,
-                deployment,
-                dependencyNames: processor.filterDependencies(dependencyNames),
-            };
-        })
-            .forEach((pkgData) => {
-            _workspaces[pkgData.name] = pkgData;
-        });
-        console.warn(chalk.yellow(
-        // prettier-ignore
-        `Python workspace discovery initialized. Workspaces found: ${Object.keys(_workspaces).join(", ")}`));
+    if (_workspacesLoaded)
+        return _workspaces;
+    // No root pyproject.toml means no Python workspaces - skip discovery
+    if (!fs.existsSync(rootPyprojectPath)) {
         _workspacesLoaded = true;
+        return _workspaces;
     }
+    const rootPyproject = TOML.parse(fs.readFileSync(rootPyprojectPath, "utf8"));
+    const workspaceMembers = rootPyproject?.tool?.uv?.workspace?.members ?? [];
+    const allPyprojectTomls = workspaceMembers.flatMap((member) => globSync(path.join(rootPath, member, "pyproject.toml")));
+    const processor = new PackageDataProcessor({
+        language: "python",
+        pathList: allPyprojectTomls,
+        zodSchema: packageFilePythonSchema,
+        fileParser: TOML.parse,
+        nameExtractor: (data) => data.project.name,
+    });
+    processor
+        .convert((data) => {
+        const deployment = data.tool?.devops?.deployment;
+        const scripts = data.tool?.devops?.scripts;
+        const dependencyNames = data.project.dependencies ?? [];
+        return {
+            scripts,
+            deployment,
+            dependencyNames: processor.filterDependencies(dependencyNames),
+        };
+    })
+        .forEach((pkgData) => {
+        _workspaces[pkgData.name] = pkgData;
+    });
+    console.warn(chalk.yellow(
+    // prettier-ignore
+    `Python workspace discovery initialized. Workspaces found: ${Object.keys(_workspaces).join(", ")}`));
+    _workspacesLoaded = true;
     return _workspaces;
 }

package/package.json

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

package/src/cli/common.ts

@@ -1,8 +1,8 @@
 import chalk from "chalk";
 import { execSync, spawn, type StdioOptions } from "child_process";
 import fs from "fs";
-import { globSync } from "glob";
 import { allSupportedEnvs } from "../libs/k8s-constants";
+import { globEnvYamlFiles } from "../libs/discovery";
 
 type ParsedArgs<TBoolKeys extends readonly string[], TParamKeys extends readonly string[]> = {
   args: string[];
@@ -294,7 +294,7 @@ export class CommandExecutor {
 
   _checkEnvYamlFiles() {
     if (!this.checkEnvYaml) return;
-    const envYamlFiles = globSync("**/env.yaml");
+    const envYamlFiles = globEnvYamlFiles();
     const checkEnvCmd = new CommandExecutor(
       `devops env _validate ${envYamlFiles.join(" ")}`,
       { env: this.env, quiet: true, checkEnvYaml: false }

package/src/cli/core/env.ts

@@ -1,10 +1,10 @@
-import { globSync } from "glob";
 import {
   deleteMonorepoSecret,
   getMonorepoSecretStr,
   setMonorepoSecret,
 } from "../../libs/k8s-secrets-manager";
 import { CombinedEnvValidator } from "../../libs/validate-env";
+import { globEnvYamlFiles } from "../../libs/discovery";
 import {
   CLICommandParser,
   dotEnvFilesForEnv,
@@ -38,7 +38,7 @@ function run(cmdObj: CLICommandParser) {
   const [command, ...rest] = cmdObj.args;
   switch (command) {
     case "validate": {
-      const envYamlFiles = globSync("**/env.yaml");
+      const envYamlFiles = globEnvYamlFiles();
 
       // We have to have a _validate so that we go through a CommandExecutor which injects env variables into the process
       cmdObj

package/src/libs/discovery/index.ts

@@ -1,8 +1,12 @@
 import chalk from "chalk";
+import { globSync } from "glob";
+import path from "path";
 import { nodeWorkspaces } from "./process-package-json";
 import { pythonWorkspaces } from "./process-pyproject-toml";
 import type { SupportedLanguages, WorkspaceIndex } from "../../types";
 
+const rootPath = process.env.MONOREPO_ROOT || process.cwd();
+
 const _workspaces: WorkspaceIndex = {};
 let _workspacesLoaded = false;
 
@@ -58,3 +62,13 @@ export function getWorkspace(workspaceName: string) {
   }
   return workspace;
 }
+
+export function globEnvYamlFiles(): string[] {
+  const allWorkspaces = workspaces();
+  const workspacePaths = [
+    ...new Set(Object.values(allWorkspaces).map((w) => w.rootPath)),
+  ];
+  return workspacePaths.flatMap((wsPath) =>
+    globSync(path.join(rootPath, wsPath, "**/env.yaml"))
+  );
+}

package/src/libs/discovery/process-pyproject-toml.ts

@@ -1,4 +1,5 @@
 import chalk from "chalk";
+import fs from "fs";
 import { globSync } from "glob";
 import { packageFilePythonSchema, type PackageData } from "../../types";
 import { PackageDataProcessor } from "./process-common";
@@ -6,44 +7,58 @@ import TOML from "@iarna/toml";
 import path from "path";
 
 const rootPath = process.env.MONOREPO_ROOT || process.cwd();
+const rootPyprojectPath = path.join(rootPath, "pyproject.toml");
 const _workspaces: Record<string, PackageData> = {};
 let _workspacesLoaded = false;
 
 export function pythonWorkspaces() {
-  if (!_workspacesLoaded) {
-    const allPyprojectTomls = globSync(
-      path.join(rootPath, "**/*/pyproject.toml")
-    );
-    const processor = new PackageDataProcessor({
-      language: "python",
-      pathList: allPyprojectTomls,
-      zodSchema: packageFilePythonSchema,
-      fileParser: TOML.parse,
-      nameExtractor: (data) => data.project.name,
-    });
+  if (_workspacesLoaded) return _workspaces;
 
-    processor
-      .convert((data) => {
-        const deployment = data.tool?.devops?.deployment;
-        const scripts = data.tool?.devops?.scripts;
-        const dependencyNames = data.project.dependencies ?? [];
-        return {
-          scripts,
-          deployment,
-          dependencyNames: processor.filterDependencies(dependencyNames),
-        };
-      })
-      .forEach((pkgData) => {
-        _workspaces[pkgData.name] = pkgData;
-      });
-
-    console.warn(
-      chalk.yellow(
-        // prettier-ignore
-        `Python workspace discovery initialized. Workspaces found: ${Object.keys(_workspaces).join(", ")}`
-      )
-    );
+  // No root pyproject.toml means no Python workspaces - skip discovery
+  if (!fs.existsSync(rootPyprojectPath)) {
     _workspacesLoaded = true;
+    return _workspaces;
   }
+
+  const rootPyproject = TOML.parse(
+    fs.readFileSync(rootPyprojectPath, "utf8")
+  ) as { tool?: { uv?: { workspace?: { members?: string[] } } } };
+  const workspaceMembers: string[] =
+    rootPyproject?.tool?.uv?.workspace?.members ?? [];
+
+  const allPyprojectTomls = workspaceMembers.flatMap((member) =>
+    globSync(path.join(rootPath, member, "pyproject.toml"))
+  );
+
+  const processor = new PackageDataProcessor({
+    language: "python",
+    pathList: allPyprojectTomls,
+    zodSchema: packageFilePythonSchema,
+    fileParser: TOML.parse,
+    nameExtractor: (data) => data.project.name,
+  });
+
+  processor
+    .convert((data) => {
+      const deployment = data.tool?.devops?.deployment;
+      const scripts = data.tool?.devops?.scripts;
+      const dependencyNames = data.project.dependencies ?? [];
+      return {
+        scripts,
+        deployment,
+        dependencyNames: processor.filterDependencies(dependencyNames),
+      };
+    })
+    .forEach((pkgData) => {
+      _workspaces[pkgData.name] = pkgData;
+    });
+
+  console.warn(
+    chalk.yellow(
+      // prettier-ignore
+      `Python workspace discovery initialized. Workspaces found: ${Object.keys(_workspaces).join(", ")}`
+    )
+  );
+  _workspacesLoaded = true;
   return _workspaces;
 }