@vaharoni/devops 1.1.4 → 1.1.6

package/README.md

@@ -29,12 +29,12 @@ 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:
 ```shell
 bun link @vaharoni/devops
-bun run build
 ```
 
 When done:

package/dist/cli/common.d.ts

@@ -70,6 +70,7 @@ export declare class CommandExecutor {
     _prepareFullCommand(): string;
     _getProcessEnv(envOverride?: {}): {
         MONOREPO_ENV: string | undefined;
+        MONOREPO_ROOT: string;
         TZ?: string;
         NODE_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

@@ -172,7 +172,7 @@ export class CommandExecutor {
     _prepareFullCommand() {
         const envPrefix = this.env ? this._envInjectorPrefix() : "";
         const fullCommand = [envPrefix, this.commandStr].join(" ").trim();
-        const envPrefixLog = this.env ? `MONOREPO_ENV=${this.env}` : "";
+        const envPrefixLog = this.env ? `MONOREPO_ENV=${this.env} MONOREPO_ROOT=${process.cwd()}` : "";
         const fullCommandLog = [envPrefixLog, fullCommand].join(" ").trim();
         if (this.redactedCommand) {
             console.warn(chalk.yellow(fullCommandLog.replace(this.commandStr, this.redactedCommand)));
@@ -183,7 +183,7 @@ export class CommandExecutor {
         return fullCommand;
     }
     _getProcessEnv(envOverride = {}) {
-        return { ...process.env, MONOREPO_ENV: this.env, ...envOverride };
+        return { ...process.env, MONOREPO_ENV: this.env, MONOREPO_ROOT: process.cwd(), ...envOverride };
     }
     _envInjectorPrefix() {
         const envFiles = dotEnvFilesForEnv(this.env);

package/dist/libs/discovery/index.js

@@ -8,13 +8,13 @@ export function workspaces() {
         return _workspaces;
     const nodeWorkspacesData = nodeWorkspaces();
     const pythonWorkspacesData = pythonWorkspaces();
-    Object.values(nodeWorkspacesData).forEach(data => {
+    Object.values(nodeWorkspacesData).forEach((data) => {
         _workspaces[data.name] = {
             rootPath: data.rootPath,
-            packageDataEntries: [data]
+            packageDataEntries: [data],
         };
     });
-    Object.values(pythonWorkspacesData).forEach(data => {
+    Object.values(pythonWorkspacesData).forEach((data) => {
         const existing = _workspaces[data.name];
         if (existing) {
             if (existing.rootPath !== data.rootPath) {
@@ -26,7 +26,7 @@ export function workspaces() {
         else {
             _workspaces[data.name] = {
                 rootPath: data.rootPath,
-                packageDataEntries: []
+                packageDataEntries: [],
             };
         }
         _workspaces[data.name].packageDataEntries.push(data);

package/dist/libs/discovery/process-package-json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"process-package-json.d.ts","sourceRoot":"","sources":["../../../src/libs/discovery/process-package-json.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAWtE,wBAAgB,cAAc,gCA+B7B"}
+{"version":3,"file":"process-package-json.d.ts","sourceRoot":"","sources":["../../../src/libs/discovery/process-package-json.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAYtE,wBAAgB,cAAc,gCAqC7B"}

package/dist/libs/discovery/process-package-json.js

@@ -4,13 +4,14 @@ import { globSync } from "glob";
 import path from "path";
 import { packageFileNodeSchema } from "../../types";
 import { PackageDataProcessor } from "./process-common";
-const rootPkgJsonPath = path.join(process.cwd(), "package.json");
+const rootPath = process.env.MONOREPO_ROOT || process.cwd();
+const rootPkgJsonPath = path.join(rootPath, "package.json");
 const rootPkgJson = JSON.parse(fs.readFileSync(rootPkgJsonPath, "utf8"));
 const _workspaces = {};
 let _workspacesLoaded = false;
 export function nodeWorkspaces() {
     if (!_workspacesLoaded) {
-        const allPackageJsons = (rootPkgJson.workspaces ?? []).flatMap((workspaceGlob) => globSync(path.join(workspaceGlob, "package.json")));
+        const allPackageJsons = (rootPkgJson.workspaces ?? []).flatMap((workspaceGlob) => globSync(path.join(rootPath, workspaceGlob, "package.json")));
         const processor = new PackageDataProcessor({
             language: "node",
             pathList: allPackageJsons,
@@ -18,11 +19,16 @@ export function nodeWorkspaces() {
             fileParser: JSON.parse,
             nameExtractor: (data) => data.name,
         });
-        processor.convert((data) => {
+        processor
+            .convert((data) => {
             const { dependencies, ...rest } = data;
             const dependencyNames = Object.keys(dependencies ?? []);
-            return { ...rest, dependencyNames: processor.filterDependencies(dependencyNames) };
-        }).forEach(pkgData => {
+            return {
+                ...rest,
+                dependencyNames: processor.filterDependencies(dependencyNames),
+            };
+        })
+            .forEach((pkgData) => {
             _workspaces[pkgData.name] = pkgData;
         });
         console.warn(chalk.yellow(

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;AAOxE,wBAAgB,gBAAgB,gCAiC/B"}
+{"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"}

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

@@ -2,12 +2,14 @@ import chalk from "chalk";
 import { globSync } from "glob";
 import { packageFilePythonSchema } from "../../types";
 import { PackageDataProcessor } from "./process-common";
-import TOML from '@iarna/toml';
+import TOML from "@iarna/toml";
+import path from "path";
+const rootPath = process.env.MONOREPO_ROOT || process.cwd();
 const _workspaces = {};
 let _workspacesLoaded = false;
 export function pythonWorkspaces() {
     if (!_workspacesLoaded) {
-        const allPyprojectTomls = globSync("**/*/pyproject.toml");
+        const allPyprojectTomls = globSync(path.join(rootPath, "**/*/pyproject.toml"));
         const processor = new PackageDataProcessor({
             language: "python",
             pathList: allPyprojectTomls,
@@ -15,16 +17,18 @@ export function pythonWorkspaces() {
             fileParser: TOML.parse,
             nameExtractor: (data) => data.project.name,
         });
-        processor.convert((data) => {
+        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)
+                dependencyNames: processor.filterDependencies(dependencyNames),
             };
-        }).forEach(pkgData => {
+        })
+            .forEach((pkgData) => {
             _workspaces[pkgData.name] = pkgData;
         });
         console.warn(chalk.yellow(

package/package.json

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

package/src/cli/common.ts

@@ -251,7 +251,7 @@ export class CommandExecutor {
     const envPrefix = this.env ? this._envInjectorPrefix() : "";
     const fullCommand = [envPrefix, this.commandStr].join(" ").trim();
 
-    const envPrefixLog = this.env ? `MONOREPO_ENV=${this.env}` : "";
+    const envPrefixLog = this.env ? `MONOREPO_ENV=${this.env} MONOREPO_ROOT=${process.cwd()}` : "";
     const fullCommandLog = [envPrefixLog, fullCommand].join(" ").trim();
     if (this.redactedCommand) {
       console.warn(
@@ -267,7 +267,7 @@ export class CommandExecutor {
   }
 
   _getProcessEnv(envOverride = {}) {
-    return { ...process.env, MONOREPO_ENV: this.env, ...envOverride };
+    return { ...process.env, MONOREPO_ENV: this.env, MONOREPO_ROOT: process.cwd(), ...envOverride };
   }
 
   _envInjectorPrefix() {

package/src/libs/discovery/index.ts

@@ -11,14 +11,14 @@ export function workspaces() {
   const nodeWorkspacesData = nodeWorkspaces();
   const pythonWorkspacesData = pythonWorkspaces();
 
-  Object.values(nodeWorkspacesData).forEach(data => {
+  Object.values(nodeWorkspacesData).forEach((data) => {
     _workspaces[data.name] = {
       rootPath: data.rootPath,
-      packageDataEntries: [data]
+      packageDataEntries: [data],
     };
-  })
+  });
 
-  Object.values(pythonWorkspacesData).forEach(data => {
+  Object.values(pythonWorkspacesData).forEach((data) => {
     const existing = _workspaces[data.name];
     if (existing) {
       if (existing.rootPath !== data.rootPath) {
@@ -29,11 +29,11 @@ export function workspaces() {
     } else {
       _workspaces[data.name] = {
         rootPath: data.rootPath,
-        packageDataEntries: []
+        packageDataEntries: [],
       };
     }
     _workspaces[data.name].packageDataEntries.push(data);
-  })
+  });
   _workspacesLoaded = true;
   return _workspaces;
 }

package/src/libs/discovery/process-package-json.ts

@@ -5,7 +5,8 @@ import path from "path";
 import { packageFileNodeSchema, type PackageData } from "../../types";
 import { PackageDataProcessor } from "./process-common";
 
-const rootPkgJsonPath = path.join(process.cwd(), "package.json");
+const rootPath = process.env.MONOREPO_ROOT || process.cwd();
+const rootPkgJsonPath = path.join(rootPath, "package.json");
 const rootPkgJson = JSON.parse(fs.readFileSync(rootPkgJsonPath, "utf8")) as {
   workspaces: string[];
 };
@@ -15,8 +16,9 @@ let _workspacesLoaded = false;
 
 export function nodeWorkspaces() {
   if (!_workspacesLoaded) {
-    const allPackageJsons = (rootPkgJson.workspaces ?? []).flatMap((workspaceGlob) =>
-      globSync(path.join(workspaceGlob, "package.json"))
+    const allPackageJsons = (rootPkgJson.workspaces ?? []).flatMap(
+      (workspaceGlob) =>
+        globSync(path.join(rootPath, workspaceGlob, "package.json"))
     );
 
     const processor = new PackageDataProcessor({
@@ -27,13 +29,18 @@ export function nodeWorkspaces() {
       nameExtractor: (data) => data.name,
     });
 
-    processor.convert((data) => {
-      const { dependencies, ...rest } = data;
-      const dependencyNames = Object.keys(dependencies ?? []);
-      return { ...rest, dependencyNames: processor.filterDependencies(dependencyNames) };
-    }).forEach(pkgData => {
-      _workspaces[pkgData.name] = pkgData
-    })
+    processor
+      .convert((data) => {
+        const { dependencies, ...rest } = data;
+        const dependencyNames = Object.keys(dependencies ?? []);
+        return {
+          ...rest,
+          dependencyNames: processor.filterDependencies(dependencyNames),
+        };
+      })
+      .forEach((pkgData) => {
+        _workspaces[pkgData.name] = pkgData;
+      });
 
     console.warn(
       chalk.yellow(
@@ -44,4 +51,4 @@ export function nodeWorkspaces() {
     _workspacesLoaded = true;
   }
   return _workspaces;
-}
+}

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

@@ -2,14 +2,18 @@ import chalk from "chalk";
 import { globSync } from "glob";
 import { packageFilePythonSchema, type PackageData } from "../../types";
 import { PackageDataProcessor } from "./process-common";
-import TOML from '@iarna/toml';
+import TOML from "@iarna/toml";
+import path from "path";
 
+const rootPath = process.env.MONOREPO_ROOT || process.cwd();
 const _workspaces: Record<string, PackageData> = {};
 let _workspacesLoaded = false;
 
 export function pythonWorkspaces() {
   if (!_workspacesLoaded) {
-    const allPyprojectTomls = globSync("**/*/pyproject.toml");
+    const allPyprojectTomls = globSync(
+      path.join(rootPath, "**/*/pyproject.toml")
+    );
     const processor = new PackageDataProcessor({
       language: "python",
       pathList: allPyprojectTomls,
@@ -18,18 +22,20 @@ export function pythonWorkspaces() {
       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
-    })
+    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(
@@ -40,4 +46,4 @@ export function pythonWorkspaces() {
     _workspacesLoaded = true;
   }
   return _workspaces;
-}
+}

package/src/target-templates/infra-variants/digitalocean/.github/workflows/k8s-build.yaml

@@ -29,11 +29,11 @@ jobs:
       - name: Setup prerequesites
         uses: ./.github/actions/setup-prereq@v1
 
-      - name: Connect to infrastructure
-        uses: ./.github/actions/connect-to-infra@v1
+      - name: Connect to Digital Ocean
+        uses: ./.github/actions/connect-to-digital-ocean@v1
         with:
-          do_access_token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
-          do_cluster_name: ${{ secrets.DIGITALOCEAN_CLUSTER_NAME }}
+          access_token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
+          cluster_name: ${{ secrets.DIGITALOCEAN_CLUSTER_NAME }}
 
       - name: Build image
         uses: ./.github/actions/build-image@v1
@@ -54,12 +54,12 @@ jobs:
       - name: Setup prerequesites
         uses: ./.github/actions/setup-prereq@v1
 
-      - name: Connect to infrastructure
-        uses: ./.github/actions/connect-to-infra@v1
+      - name: Connect to Digital Ocean
+        uses: ./.github/actions/connect-to-digital-ocean@v1
         with:
-          do_access_token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
-          do_cluster_name: ${{ secrets.DIGITALOCEAN_CLUSTER_NAME }}
-
+          access_token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
+          cluster_name: ${{ secrets.DIGITALOCEAN_CLUSTER_NAME }}
+          
       - name: Run DB Migrate
         uses: ./.github/actions/db-migrate@v1
 

package/src/target-templates/infra-variants/gcloud/.github/workflows/k8s-build.yaml

@@ -29,13 +29,13 @@ jobs:
       - name: Setup prerequesites
         uses: ./.github/actions/setup-prereq@v1
 
-      - name: Connect to infrastructure
-        uses: ./.github/actions/connect-to-infra@v1
+      - name: Connect to Google Cloud GKE
+        uses: ./.github/actions/connect-to-gke@v1
         with:
-          gcloud_project_id: ${{ secrets.GCLOUD_PROJECT_ID }}
-          gcloud_zone: ${{ secrets.GCLOUD_ZONE }}
-          gcloud_cluster_name: ${{ secrets.GCLOUD_CLUSTER_NAME }}
-          gcloud_service_account_key: ${{ secrets.GCLOUD_SA_KEY }}
+          project_id: ${{ secrets.GCLOUD_PROJECT_ID }}
+          zone: ${{ secrets.GCLOUD_ZONE }}
+          cluster_name: ${{ secrets.GCLOUD_CLUSTER_NAME }}
+          service_account_key: ${{ secrets.GCLOUD_SA_KEY }}        
 
       - name: Build image
         uses: ./.github/actions/build-image@v1
@@ -56,13 +56,13 @@ jobs:
       - name: Setup prerequesites
         uses: ./.github/actions/setup-prereq@v1
 
-      - name: Connect to infrastructure
-        uses: ./.github/actions/connect-to-infra@v1
+      - name: Connect to Google Cloud GKE
+        uses: ./.github/actions/connect-to-gke@v1
         with:
-          gcloud_project_id: ${{ secrets.GCLOUD_PROJECT_ID }}
-          gcloud_zone: ${{ secrets.GCLOUD_ZONE }}
-          gcloud_cluster_name: ${{ secrets.GCLOUD_CLUSTER_NAME }}
-          gcloud_service_account_key: ${{ secrets.GCLOUD_SA_KEY }}
+          project_id: ${{ secrets.GCLOUD_PROJECT_ID }}
+          zone: ${{ secrets.GCLOUD_ZONE }}
+          cluster_name: ${{ secrets.GCLOUD_CLUSTER_NAME }}
+          service_account_key: ${{ secrets.GCLOUD_SA_KEY }}
 
       - name: Run DB Migrate
         uses: ./.github/actions/db-migrate@v1

package/src/target-templates/infra-variants/hetzner/.github/workflows/k8s-build.yaml

@@ -29,12 +29,12 @@ jobs:
       - name: Setup prerequesites
         uses: ./.github/actions/setup-prereq@v1
 
-      - name: Connect to infrastructure
-        uses: ./.github/actions/connect-to-infra@v1
+      - name: Connect to Hetzner
+        uses: ./.github/actions/connect-to-hetzner@v1
         with:
-          hetzner_kubeconfig: ${{ secrets.HCLOUD_KUBECONFIG }}
+          kubeconfig: ${{ secrets.HCLOUD_KUBECONFIG }}
           harbor_user: ${{ secrets.HARBOR_USER }}
-          harbor_password: ${{ secrets.HARBOR_PASSWORD }}
+          harbor_password: ${{ secrets.HARBOR_PASSWORD }}        
 
       - name: Build image
         uses: ./.github/actions/build-image@v1
@@ -55,12 +55,12 @@ jobs:
       - name: Setup prerequesites
         uses: ./.github/actions/setup-prereq@v1
 
-      - name: Connect to infrastructure
-        uses: ./.github/actions/connect-to-infra@v1
+      - name: Connect to Hetzner
+        uses: ./.github/actions/connect-to-hetzner@v1
         with:
-          hetzner_kubeconfig: ${{ secrets.HCLOUD_KUBECONFIG }}
+          kubeconfig: ${{ secrets.HCLOUD_KUBECONFIG }}
           harbor_user: ${{ secrets.HARBOR_USER }}
-          harbor_password: ${{ secrets.HARBOR_PASSWORD }}
+          harbor_password: ${{ secrets.HARBOR_PASSWORD }}        
 
       - name: Run DB Migrate
         uses: ./.github/actions/db-migrate@v1

package/src/target-templates/lang-variants-common/typescript/.github/actions/connect-to-infra@v1/action.yaml

@@ -1,67 +0,0 @@
-name: "Connect to the infrastructure"
-description: "Convenience action to connect either to Digital Ocean or Hetzner based on the inputs provided"
-inputs:
-  do_access_token:
-    description: "DigitalOcean access token"
-    required: false
-  do_cluster_name:
-    description: "DigitalOcean cluster name"
-    required: false
-  hetzner_kubeconfig:
-    description: "The Hetzner kubeconfig file"
-    required: false
-  harbor_user:
-    description: "The user name for the harbor registry"
-    required: false
-  harbor_password:
-    description: "The password for the harbor registry"
-    required: false
-  gcloud_project_id:
-    description: "Google Cloud project ID"
-    required: false
-  gcloud_zone:
-    description: "Google Cloud GKE zone (e.g., us-central1)"
-    required: false
-  gcloud_cluster_name:
-    description: "Google Cloud GKE cluster name"
-    required: false
-  gcloud_service_account_key:
-    description: "Google Cloud service account key in JSON format"
-    required: false
-outputs:
-  infra:
-    description: "Which infrastructure is being used"
-    value: steps.determine_infrastructure.outputs.infra
-runs:
-  using: "composite"
-  steps:
-    - name: Determine the infrastructure
-      id: determine_infrastructure
-      shell: bash
-      run: |
-        INFRA=$(devops constant infra)
-        echo "infra=$INFRA" >> $GITHUB_OUTPUT
-
-    - name: Connect to Digital Ocean
-      if: steps.determine_infrastructure.outputs.infra == 'digitalocean'
-      uses: ./.github/actions/connect-to-digital-ocean@v1
-      with:
-        access_token: ${{ inputs.do_access_token }}
-        cluster_name: ${{ inputs.do_cluster_name }}
-
-    - name: Connect to Hetzner
-      if: steps.determine_infrastructure.outputs.infra == 'hetzner'
-      uses: ./.github/actions/connect-to-hetzner@v1
-      with:
-        kubeconfig: ${{ inputs.hetzner_kubeconfig }}
-        harbor_user: ${{ inputs.harbor_user }}
-        harbor_password: ${{ inputs.harbor_password }}
-
-    - name: Connect to Google Cloud GKE
-      if: steps.determine_infrastructure.outputs.infra == 'gcloud'
-      uses: ./.github/actions/connect-to-gke@v1
-      with:
-        project_id: ${{ inputs.gcloud_project_id }}
-        zone: ${{ inputs.gcloud_zone }}
-        cluster_name: ${{ inputs.gcloud_cluster_name }}
-        service_account_key: ${{ inputs.gcloud_service_account_key }}