@vaharoni/devops 1.0.47 → 1.0.49

package/README.md

@@ -46,6 +46,6 @@ bun unlink
 To release:
 ```shell
 npm version patch
-git push --tags
+git push --follow-tags
 gh release create vX.Y.Z
 ```

package/dist/cli/init.js

@@ -55,12 +55,17 @@ To finish the setup:
   ],
 
 2. add the following to your .gitignore:
-.envrc
-**/.DS_Store
 **/.env*
 config/kubeconfig
 tmp/**
 !tmp/**/.gitkeep
 venv/
 **/__pycache__
+
+3. optionally create an .envrc file with the following content and run direnv allow: 
+if [ -f "$PWD/config/kubeconfig" ]; then
+  export KUBECONFIG="$PWD/config/kubeconfig"
+else
+  export KUBECONFIG="$HOME/.kube/config"
+fi
 `;

package/package.json

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

package/src/cli/init.ts

@@ -64,12 +64,17 @@ To finish the setup:
   ],
 
 2. add the following to your .gitignore:
-.envrc
-**/.DS_Store
 **/.env*
 config/kubeconfig
 tmp/**
 !tmp/**/.gitkeep
 venv/
 **/__pycache__
+
+3. optionally create an .envrc file with the following content and run direnv allow: 
+if [ -f "$PWD/config/kubeconfig" ]; then
+  export KUBECONFIG="$PWD/config/kubeconfig"
+else
+  export KUBECONFIG="$HOME/.kube/config"
+fi
 `;

package/src/target-templates/.devops/docker-images/node-services.Dockerfile

@@ -18,10 +18,7 @@ RUN npm install -g bun
 COPY . .
 
 # Install dependencies using bun
-# Mount the GH_PAT_TOKEN secret and use it during bun install
-RUN --mount=type=secret,id=GH_PAT_TOKEN \
-  --mount=type=cache,target=/root/.bun/install/cache \
-  GH_PAT_TOKEN=$(cat /run/secrets/GH_PAT_TOKEN) bun install
+RUN --mount=type=cache,target=/root/.bun/install/cache bun install
 
 # For prisma client, if used
 RUN ./devops run-many generate

package/src/target-templates/.github/actions/build-image@v1/action.yaml

@@ -4,9 +4,6 @@ inputs:
   image_name:
     description: 'The image key in images.yaml'
     required: true
-  gh_pat_token:
-    description: "GitHub personal access token"
-    required: true
   cache_path:
     description: "The path to cache inside the container"
     required: true
@@ -74,8 +71,6 @@ runs:
         tags: ${{ env.ECR_URL }}
         cache-from: type=gha
         cache-to: type=gha,mode=max
-        secrets: |
-          GH_PAT_TOKEN=${{ inputs.gh_pat_token }}
         build-args: |
           MONOREPO_ENV=${{ env.MONOREPO_ENV }}
 

package/src/target-templates/.github/actions/setup-prereq@v1/action.yaml

@@ -1,9 +1,5 @@
 name: "Install prerequesites"
 description: "Sets up Node, Bun, and devops"
-inputs:
-  gh_pat_token:
-    description: "The GitHub Personal Access Token"
-    required: true
 runs:
   using: "composite"
   steps:
@@ -20,7 +16,6 @@ runs:
       run: |
         BRANCH_NAME=${{ github.ref_name }}
         echo "MONOREPO_ENV=$BRANCH_NAME" >> $GITHUB_ENV
-        echo "GH_PAT_TOKEN=${{ inputs.gh_pat_token }}" >> $GITHUB_ENV
 
     - name: Install the devops tool
       shell: bash

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

@@ -28,8 +28,6 @@ jobs:
 
       - name: Setup prerequesites
         uses: ./.github/actions/setup-prereq@v1
-        with:
-          gh_pat_token: ${{ secrets.GH_PAT_TOKEN }}
 
       - name: Connect to infrastructure
         uses: ./.github/actions/connect-to-infra@v1
@@ -44,7 +42,6 @@ jobs:
         uses: ./.github/actions/build-image@v1
         with:
           image_name: ${{ matrix.image_name }}
-          gh_pat_token: ${{ secrets.GH_PAT_TOKEN }}
           cache_path: ${{ matrix.cache_path || '/root/.bun/install/cache' }}
 
   db_migrate_and_deploy:
@@ -59,8 +56,6 @@ jobs:
 
       - name: Setup prerequesites
         uses: ./.github/actions/setup-prereq@v1
-        with:
-          gh_pat_token: ${{ secrets.GH_PAT_TOKEN }}
 
       - name: Connect to infrastructure
         uses: ./.github/actions/connect-to-infra@v1

package/dist/libs/dependencies.d.ts

@@ -1,19 +0,0 @@
-import type { ProjectData } from "../types";
-export declare class WorkspaceDependencies {
-    getAllProjects: () => Record<string, ProjectData>;
-    dependencies: Record<string, DependencyNode>;
-    loaded: boolean;
-    projects: Record<string, ProjectData>;
-    constructor(getAllProjects: () => Record<string, ProjectData>);
-    _getOrCreate(name: string): DependencyNode;
-    _buildTree(): void;
-    getDependents(workspaceName: string): string[];
-}
-declare class DependencyNode {
-    name: string;
-    dependsOn: Set<string>;
-    constructor(name: string);
-    flattenDependents(allDependencies: Record<string, DependencyNode>, visited?: Set<string>): string[];
-}
-export {};
-//# sourceMappingURL=dependencies.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../src/libs/dependencies.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,qBAAa,qBAAqB;IAKb,cAAc,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC;IAJpE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAM;IAClD,MAAM,UAAS;IACf,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAM;gBAExB,cAAc,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC;IAEpE,YAAY,CAAC,IAAI,EAAE,MAAM;IASzB,UAAU;IAcV,aAAa,CAAC,aAAa,EAAE,MAAM;CAWpC;AAED,cAAM,cAAc;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;gBAEX,IAAI,EAAE,MAAM;IAKxB,iBAAiB,CACf,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,EAC/C,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;CAexB"}

package/dist/libs/dependencies.js

@@ -1,62 +0,0 @@
-import chalk from "chalk";
-export class WorkspaceDependencies {
-    getAllProjects;
-    dependencies = {};
-    loaded = false;
-    projects = {};
-    constructor(getAllProjects) {
-        this.getAllProjects = getAllProjects;
-    }
-    _getOrCreate(name) {
-        let node = this.dependencies[name];
-        if (!node) {
-            node = new DependencyNode(name);
-            this.dependencies[name] = node;
-        }
-        return node;
-    }
-    _buildTree() {
-        this.projects = this.getAllProjects();
-        this.loaded = true;
-        for (const workspace of Object.keys(this.projects)) {
-            const node = this._getOrCreate(workspace);
-            const { data } = this.projects[workspace];
-            for (const dep of data.dependencyNames ?? []) {
-                if (this.projects[dep]) {
-                    node.dependsOn.add(dep);
-                }
-            }
-        }
-    }
-    getDependents(workspaceName) {
-        if (!this.loaded) {
-            this._buildTree();
-        }
-        const node = this.dependencies[workspaceName];
-        if (!node) {
-            console.error(chalk.red(`\nWorkspace ${workspaceName} not found\n`));
-            process.exit(1);
-        }
-        return node.flattenDependents(this.dependencies);
-    }
-}
-class DependencyNode {
-    name;
-    dependsOn;
-    constructor(name) {
-        this.name = name;
-        this.dependsOn = new Set();
-    }
-    flattenDependents(allDependencies, visited) {
-        visited ??= new Set();
-        visited.add(this.name);
-        const notVisitedDependents = [];
-        for (const dep of this.dependsOn) {
-            if (!visited.has(dep)) {
-                const node = allDependencies[dep];
-                notVisitedDependents.push(...node.flattenDependents(allDependencies, visited));
-            }
-        }
-        return [this.name, ...notVisitedDependents];
-    }
-}

package/dist/libs/dependencies.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=dependencies.spec.d.ts.map

package/dist/libs/dependencies.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dependencies.spec.d.ts","sourceRoot":"","sources":["../../src/libs/dependencies.spec.ts"],"names":[],"mappings":""}

package/dist/libs/dependencies.spec.js

@@ -1,21 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { WorkspaceDependencies } from './dependencies';
-describe('createDependencyResolver', () => {
-    const projects = {
-        '@local/a': { rootPath: 'applications/a', data: { name: '@local/a', dependencies: { '@local/b': 'workspace:*', '@local/d': 'workspace:*', external1: "^1.0.0" } } },
-        '@local/b': { rootPath: 'applications/b', data: { name: '@local/b', dependencies: { '@local/c': 'workspace:*', external2: "^1.0.0" } } },
-        '@local/c': { rootPath: 'applications/c', data: { name: '@local/c', dependencies: { external3: "^1.0.0" } } },
-        '@local/d': { rootPath: 'applications/d', data: { name: '@local/d' } },
-        '@local/e': { rootPath: 'applications/e', data: { name: '@local/e', dependencies: { '@local/f': 'workspace:*' } } },
-        '@local/f': { rootPath: 'applications/f', data: { name: '@local/f', dependencies: { '@local/e': 'workspace:*' } } },
-    };
-    it('should return dependents of a given project', () => {
-        const resolver = new WorkspaceDependencies(() => projects);
-        expect(resolver.getDependents('@local/a')).toEqual(['@local/a', '@local/b', '@local/c', '@local/d']);
-        expect(resolver.getDependents('@local/b')).toEqual(['@local/b', '@local/c']);
-        expect(resolver.getDependents('@local/c')).toEqual(['@local/c']);
-        expect(resolver.getDependents('@local/d')).toEqual(['@local/d']);
-        expect(resolver.getDependents('@local/e')).toEqual(['@local/e', '@local/f']);
-        expect(resolver.getDependents('@local/f')).toEqual(['@local/f', '@local/e']);
-    });
-});

package/dist/libs/discovery/package-json-processor.d.ts

@@ -1,3 +0,0 @@
-import { type ProjectData } from "../../types";
-export declare function nodeWorkspaces(): Record<string, ProjectData>;
-//# sourceMappingURL=package-json-processor.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"package-json-processor.d.ts","sourceRoot":"","sources":["../../../src/libs/discovery/package-json-processor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAUlE,wBAAgB,cAAc,gCAgC7B"}

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

@@ -1,34 +0,0 @@
-import chalk from "chalk";
-import fs from "fs";
-import { globSync } from "glob";
-import path from "path";
-import { packageJsonSchema } from "../../types";
-const rootPkgJsonPath = path.join(process.cwd(), "package.json");
-const rootPkgJson = JSON.parse(fs.readFileSync(rootPkgJsonPath, "utf8"));
-const _workspaces = {};
-let _workspacesLoaded = false;
-export function nodeWorkspaces() {
-    if (!_workspacesLoaded) {
-        for (const workspaceGlob of (rootPkgJson.workspaces ?? [])) {
-            globSync(path.join(workspaceGlob, "package.json")).forEach((packageJsonPath) => {
-                // Skip packages under node_modules directories in case hoisting did not work
-                if (packageJsonPath.includes("node_modules"))
-                    return;
-                const unsafeData = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
-                const parsedRes = packageJsonSchema.safeParse(unsafeData);
-                if (parsedRes.error) {
-                    console.error(`Error parsing ${packageJsonPath}: ${parsedRes.error}`);
-                    process.exit(1);
-                }
-                const { dependencies, ...rest } = parsedRes.data;
-                const dependencyNames = Object.keys(dependencies ?? []);
-                const pkgName = rest.name;
-                const rootPath = path.dirname(packageJsonPath);
-                _workspaces[pkgName] = { data: { ...rest, dependencyNames }, rootPath };
-            });
-        }
-        console.warn(chalk.yellow(`Node workspace discovery initialized. Workspaces found: ${Object.keys(_workspaces).join(", ")}`));
-        _workspacesLoaded = true;
-    }
-    return _workspaces;
-}

package/dist/libs/discovery/pyproject-toml-processor.d.ts

@@ -1,3 +0,0 @@
-import { type ProjectData } from "../../types";
-export declare function pythonWorkspaces(): Record<string, ProjectData>;
-//# sourceMappingURL=pyproject-toml-processor.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"pyproject-toml-processor.d.ts","sourceRoot":"","sources":["../../../src/libs/discovery/pyproject-toml-processor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAMhE,wBAAgB,gBAAgB,gCAsC/B"}

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

@@ -1,39 +0,0 @@
-import chalk from "chalk";
-import fs from "fs";
-import { globSync } from "glob";
-import path from "path";
-import { pyProjectSchema } from "../../types";
-import TOML from '@iarna/toml';
-const _workspaces = {};
-let _workspacesLoaded = false;
-export function pythonWorkspaces() {
-    if (!_workspacesLoaded) {
-        globSync(path.join(process.cwd(), "**/*/pyproject.toml")).forEach((pyProjectPath) => {
-            // Skip packages under venv just in case
-            if (pyProjectPath.includes("venv"))
-                return;
-            const unsafeData = TOML.parse(fs.readFileSync(pyProjectPath, "utf8"));
-            const parsedRes = pyProjectSchema.safeParse(unsafeData);
-            if (parsedRes.error) {
-                console.error(`Error parsing ${pyProjectPath}: ${parsedRes.error}`);
-                process.exit(1);
-            }
-            const data = parsedRes.data;
-            const pkgName = data.project.name;
-            const deployment = data.tool?.devops?.deployment;
-            const rootPath = path.dirname(pyProjectPath);
-            _workspaces[pkgName] = {
-                rootPath,
-                data: {
-                    name: pkgName,
-                    scripts: data.tool?.poetry?.scripts,
-                    dependencyNames: Object.keys(data.tool?.poetry?.dependencies ?? []),
-                    deployment,
-                }
-            };
-        });
-        console.warn(chalk.yellow(`Python workspace discovery initialized. Workspaces found: ${Object.keys(_workspaces).join(", ")}`));
-        _workspacesLoaded = true;
-    }
-    return _workspaces;
-}

package/dist/libs/workspace-discovery.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=workspace-discovery.d.ts.map

package/dist/libs/workspace-discovery.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"workspace-discovery.d.ts","sourceRoot":"","sources":["../../src/libs/workspace-discovery.ts"],"names":[],"mappings":""}

package/dist/libs/workspace-discovery.js

@@ -1,75 +0,0 @@
-// import chalk from "chalk";
-// import fs from "fs";
-// import { globSync } from "glob";
-// import path from "path";
-// import type { PkgData, ProjectData } from "../types";
-// import { WorkspaceDependencies } from "./dependencies";
-// import { getImageData, getImageNames } from "./config";
-export {};
-// const _imageDescendents: Record<string, string[]> = {};
-// let _imageDescendentsLoaded = false;
-// function imageDescendents() {
-//   if (!_imageDescendentsLoaded) {
-//     for (const imageName of getImageNames()) {
-//       const imageData = getImageData(imageName);
-//       const descendents = new Set<string>();
-//       imageData.applications.forEach((project) => {
-//         descendents.add(project);
-//         getDescendentNames(project).forEach((name) => descendents.add(name));
-//       });
-//       _imageDescendents[imageName] = Array.from(descendents);
-//     }
-//     _imageDescendentsLoaded = true;
-//   }
-//   return _imageDescendents;
-// }
-// const _workspaceImages: Record<string, string[]> = {};
-// let _workspaceImagesLoaded = false;
-// function workspaceImages() {
-//   if (!_workspaceImagesLoaded) {
-//     for (const [imageName, descendents] of Object.entries(imageDescendents())) {
-//       for (const workspaceName of descendents) {
-//         _workspaceImages[workspaceName] ??= [];
-//         _workspaceImages[workspaceName].push(imageName);
-//       }
-//     }
-//     _workspaceImagesLoaded = true;
-//   }
-//   return _workspaceImages;
-// }
-// export function workspaceNames() {
-//   return Object.keys(workspaces());
-// }
-// export function getWorkspace(workspaceName: string) {
-//   const workspace = workspaces()[workspaceName];
-//   if (!workspace) {
-//     console.error(chalk.red(`\nWorkspace ${workspaceName} not found\n`));
-//     // The gha relies on the 13 exit code for "not found"
-//     process.exit(13);
-//   }
-//   return workspace;
-// }
-// const dependencyResolve = new WorkspaceDependencies(workspaces);
-// /** Note: this includes the name of the provided workspace */
-// export function getDescendentNames(workspaceName: string) {
-//   const _ensurePresence = getWorkspace(workspaceName);
-//   return dependencyResolve.getDependents(workspaceName);
-// }
-// /** Note: this includes the provided workspace's data */
-// export function getDecendentData(workspaceName: string) {
-//   return getDescendentNames(workspaceName).map((name) => getWorkspace(name));
-// }
-// /** The dependent workspaces are specified in config/images.yaml */
-// export function getImageDescendentNames(imageName: string) {
-//   return imageDescendents()[imageName];
-// }
-// /** The dependent workspaces are specified in config/images.yaml */
-// export function getImageDescendentData(imageName: string) {
-//   return (
-//     getImageDescendentNames(imageName).map((name) => getWorkspace(name)) ?? []
-//   );
-// }
-// export function getWorkspaceImages(workspaceName: string) {
-//   const _verifyPresence = getWorkspace(workspaceName);
-//   return workspaceImages()[workspaceName] ?? [];
-// }

package/src/target-templates/.envrc

@@ -1,5 +0,0 @@
-if [ -f "$PWD/config/kubeconfig" ]; then
-  export KUBECONFIG="$PWD/config/kubeconfig"
-else
-  export KUBECONFIG="${HOME}/.kube/config"
-fi