@vaharoni/devops 1.1.0 → 1.1.2

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/cli/init.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,UAAU,CAAC;AAgB/D,iBAAe,GAAG,CAAC,MAAM,EAAE,gBAAgB,iBAG1C;;;;;;;;AAED,wBAEE"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/cli/init.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,UAAU,CAAC;AAmB/D,iBAAe,GAAG,CAAC,MAAM,EAAE,gBAAgB,iBAG1C;;;;;;;;AAED,wBAEE"}

package/dist/cli/init.js

@@ -1,11 +1,8 @@
-import url from "url";
-import path from "path";
-import fs from "fs-extra";
-const __file__ = url.fileURLToPath(import.meta.url);
-const __root__ = path.join(path.dirname(__file__), "../..");
-const templatesDir = path.join(__root__, "src/target-templates");
-const targetDir = process.cwd(); // User's current working directory
+import inquirer from "inquirer";
+import { InitGenerator } from "../libs/init-generator";
 import { CLICommandParser, printUsageAndExit } from "./common";
+import chalk from "chalk";
+import fs from 'fs-extra';
 const oneLiner = "Initializes the devops utility by copying template files to the current folder";
 const keyExamples = `$ devops init`;
 const usage = `
@@ -20,52 +17,205 @@ EXAMPLES
 async function run(cmdObj) {
     if (cmdObj.help)
         printUsageAndExit(usage);
-    copyTemplates();
+    createFiles();
 }
 export default {
     init: { oneLiner, keyExamples, run },
 };
-async function copyTemplates() {
-    console.log(`Initializing devops files from ${templatesDir} to ${targetDir}`);
-    try {
-        // Copy files without overriding existing ones
-        await fs.copy(templatesDir, targetDir, {
-            overwrite: false,
-            errorOnExist: false,
-            dereference: false,
-        });
-        console.log(successMessage);
+async function createFiles() {
+    const tc = new InitGenerator();
+    const userChoices = await getUserChoices(tc.projectName);
+    // Language variants
+    tc.addCopiedFolder("lang-variants-common/typescript", ".");
+    if (userChoices.usePython) {
+        tc.addCopiedFolder("lang-variants-common/python", ".");
+        tc.enableSubtitution("pyproject.toml");
     }
-    catch (error) {
-        console.error("❌ Failed to initialize devops files:", error);
-        process.exit(1);
+    tc.enableSubtitution(".devops/config/images.yaml");
+    tc.setMessageGenerator(".envrc", envrcMessage);
+    // gitignore
+    const gitIgnore = gitIgnoreContent(userChoices.infraVariant, userChoices.usePython);
+    tc.addGeneratedFile(".gitignore", gitIgnore);
+    tc.setMessageGenerator(".gitignore", gitignoreMessageGen(gitIgnore));
+    // Infra variants
+    tc.addCopiedFolder(`infra-variants/${userChoices.infraVariant}`, ".");
+    tc.enableSubtitution(".devops/config/constants.yaml");
+    if (userChoices.infraVariant === "hetzner") {
+        tc.enableSubtitution(".devops/infra/hetzner/harbor-cert.yaml");
+        tc.enableSubtitution(".devops/infra/hetzner/harbor-values.yaml");
+        tc.enableSubtitution(".devops/infra/hetzner/hcloud-config.yaml");
     }
+    // Prisma
+    if (userChoices.usePrisma) {
+        tc.addCopiedFolder("lang-variants-prisma/typescript", ".");
+        if (userChoices.usePython) {
+            tc.addCopiedFolder("lang-variants-prisma/python", ".");
+        }
+    }
+    // Cluster resources
+    const clusterResources = new Set(userChoices.clusterResources);
+    if (clusterResources.has("dns-test")) {
+        tc.addCopiedFolder("cluster-resource-options/dns-test", ".devops/infra/dns-test");
+    }
+    if (clusterResources.has("monitoring-ingress")) {
+        tc.addCopiedFolder("cluster-resource-options/monitoring-ingress", ".devops/infra/monitoring-ingress");
+    }
+    if (clusterResources.has("postgres")) {
+        tc.addCopiedFolder("cluster-resource-options/postgres", ".devops/infra/postgres");
+        // prettier-ignore
+        tc.enableSubtitution(".devops/infra/postgres/staging/configurations/07-SGObjectStorage.yaml");
+        // prettier-ignore
+        tc.enableSubtitution(".devops/infra/postgres/staging/configurations/08-SGScript.yaml");
+        // prettier-ignore
+        tc.enableSubtitution(".devops/infra/postgres/production/configurations/07-SGObjectStorage.yaml");
+        // prettier-ignore
+        tc.enableSubtitution(".devops/infra/postgres/production/configurations/08-SGScript.yaml");
+    }
+    if (clusterResources.has("redis")) {
+        tc.addCopiedFolder("cluster-resource-options/redis", ".devops/infra/redis");
+    }
+    if (clusterResources.has("milvus")) {
+        tc.addCopiedFolder("cluster-resource-options/milvus", ".devops/infra/milvus");
+    }
+    if (clusterResources.has("prefect") && userChoices.usePython) {
+        tc.addCopiedFolder("cluster-resource-options/prefect", ".devops/infra/prefect");
+    }
+    tc.run({
+        substitution: {
+            'PROJECT_NAME': userChoices.projectName,
+            'STAGING_DOMAIN': userChoices.stagingDomain,
+            'PRODUCTION_DOMAIN': userChoices.productionDomain,
+            'GCLOUD_PROJECT_ID': userChoices.gcloudProjectId,
+            'REGISTRY_IMAGE_PATH_PREFIX': userChoices.registryImagePathPrefix,
+            'REGISTRY_BASE_URL': userChoices.registryBaseUrl,
+        },
+        messages: [
+            packageJsonMessage(userChoices.usePrisma)
+        ]
+    });
 }
-const successMessage = `
-✅ Devops files initialized successfully!
-
-To finish the setup: 
-
-1. add the following entry to the main package.json:
-  "workspaces": [
-    "libs/**",
-    "applications/**",
+function packageJsonMessage(usePrisma) {
+    const prismaMessage = usePrisma
+        ? `,
     "db/**",
-    "dml/**"
-  ],
-
-2. add the following to your .gitignore:
-**/.env*
+    "dml/**"`
+        : "";
+    return `add the following entry to the main ${chalk.blue("package.json")}:
+  ${chalk.yellow(`"workspaces": [
+    "libs/**",
+    "applications/**"${prismaMessage}
+  ],`)}`;
+}
+function gitIgnoreContent(infraVariant, usePython) {
+    const common = `**/.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
-`;
+!tmp/**/.gitkeep`;
+    const gcloud = infraVariant === 'gcloud'
+        ? 'config/gke_gcloud_auth_plugin_cache'
+        : null;
+    const python = usePython
+        ? `venv/
+**/__pycache__`
+        : null;
+    return [common, gcloud, python].filter(Boolean).join('\n');
+}
+function gitignoreMessageGen(content) {
+    return (exists) => {
+        if (!exists)
+            return;
+        return `add the following to your ${chalk.blue(".gitignore")}:
+${chalk.yellow(content)}`;
+    };
+}
+function envrcMessage(targetExists, fileInfo) {
+    if (fileInfo.type !== 'copied')
+        throw new Error(`envrcMessage() expects a copied file, got ${fileInfo.type}`);
+    if (targetExists) {
+        const content = fs.readFileSync(fileInfo.sourceAbs, 'utf-8');
+        return `add the following to your ${chalk.blue(".envrc")} and run ${chalk.yellow("direnv allow")}:
+${chalk.yellow(content)}`;
+    }
+    else {
+        return `Enable ${chalk.blue(".envrc")} by installing ${chalk.blue('direnv')} and running ${chalk.yellow("direnv allow")}`;
+    }
+}
+function getUserChoices(projectName) {
+    const defaultProjectName = projectName || "changeme";
+    return inquirer.prompt([
+        {
+            type: "input",
+            name: "projectName",
+            message: `Enter the project name (default: '${defaultProjectName}')`,
+            default: defaultProjectName,
+        },
+        {
+            type: "input",
+            name: "stagingDomain",
+            message: "Enter the staging domain (default: 'staging.com')",
+            default: "staging.com",
+        },
+        {
+            type: "input",
+            name: "productionDomain",
+            message: "Enter the production domain (default: 'production.com')",
+            default: "production.com",
+        },
+        {
+            type: "list",
+            name: "infraVariant",
+            message: "Where does your cluster run?",
+            choices: [
+                { name: "Google Cloud", value: "gcloud" },
+                { name: "Digital Ocean", value: "digitalocean" },
+                { name: "Hetzner", value: "hetzner" },
+            ],
+        },
+        {
+            type: "input",
+            name: "gcloudProjectId",
+            message: "Enter the GCP project ID (default: 'changeme')",
+            default: "changeme",
+            when: (answers) => answers.infraVariant === "gcloud",
+        },
+        {
+            type: "input",
+            name: "registryImagePathPrefix",
+            message: (answers) => `Enter your Digital Ocean container registry name (default: '${answers.projectName}')`,
+            default: (answers) => answers.projectName,
+            when: (answers) => answers.infraVariant === "digitalocean",
+        },
+        {
+            type: "input",
+            name: "registryBaseUrl",
+            message: (answers) => `Enter your registry base URL (default: 'registry.${answers.stagingDomain}')`,
+            default: (answers) => `registry.${answers.stagingDomain}`,
+            when: (answers) => answers.infraVariant === "hetzner",
+        },
+        {
+            type: "confirm",
+            name: "usePython",
+            message: "Add support for Python?",
+            default: true,
+        },
+        {
+            type: "confirm",
+            name: "usePrisma",
+            message: "Add support for Prisma?",
+            default: true,
+        },
+        {
+            type: "checkbox",
+            name: "clusterResources",
+            message: "Optional manifests and helm charts to add",
+            choices: (answers) => [
+                { name: "Manifest to test DNS setup", value: "dns-test" },
+                { name: "Manifest to setup ingress for graphana and prometheus", value: "monitoring-ingress" },
+                { name: "Stackgres CRDs and manifests for Postgres", value: "postgres" },
+                { name: "Redis Helm chart values", value: "redis" },
+                { name: "Milvus helm chart values", value: "milvus" },
+                ...(answers.usePython ? [{ name: "Prefect Helm chart values", value: "prefect" }] : [])
+            ]
+        }
+    ]);
+}

package/dist/libs/init-generator.d.ts

@@ -0,0 +1,41 @@
+type MessageGeneratorFn = (targetExists: boolean, fileInfo: InitGeneratorFileInfo) => string | null | undefined;
+type CommonFileInfo = {
+    targetRel: string;
+    targetAbs: string;
+    targetFolderAbs: string;
+    targetExists: boolean;
+    messageGenerator?: MessageGeneratorFn;
+};
+export type InitGeneratorCopiedFileInfo = CommonFileInfo & {
+    type: "copied";
+    sourceRel: string;
+    sourceAbs: string;
+    enableSubstitution?: boolean;
+};
+type InitGeneratorGeneratedFileInfo = CommonFileInfo & {
+    type: "generated";
+    content: string;
+};
+export type InitGeneratorFileInfo = InitGeneratorCopiedFileInfo | InitGeneratorGeneratedFileInfo;
+export declare class InitGenerator {
+    projectName?: string;
+    /** The key is targetRel */
+    files: Record<string, InitGeneratorFileInfo>;
+    constructor();
+    _ensureFileExists(targetRel: string): void;
+    enableSubtitution(targetRel: string): void;
+    setMessageGenerator(targetRel: string, messageGen: MessageGeneratorFn): void;
+    addGeneratedFile(targetRel: string, content: string): void;
+    /**
+     * @param source relative path under the templates folder. All files and folders under `source` are copied directly under `target`.
+     * @param target relative path under the project root folder.
+     * If the target file exists already in `files`, it will be overridden.
+     */
+    addCopiedFolder(source: string, target: string): void;
+    run({ substitution, messages, }: {
+        substitution?: Record<string, string | undefined>;
+        messages?: string[];
+    }): void;
+}
+export {};
+//# sourceMappingURL=init-generator.d.ts.map

package/dist/libs/init-generator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"init-generator.d.ts","sourceRoot":"","sources":["../../src/libs/init-generator.ts"],"names":[],"mappings":"AAWA,KAAK,kBAAkB,GAAG,CAAC,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,qBAAqB,KAAK,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AAEhH,KAAK,cAAc,GAAG;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,kBAAkB,CAAC;CACvC,CAAA;AAED,MAAM,MAAM,2BAA2B,GAAG,cAAc,GAAE;IACxD,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAA;AAED,KAAK,8BAA8B,GAAG,cAAc,GAAG;IACrD,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG,2BAA2B,GAAG,8BAA8B,CAAC;AAEjG,qBAAa,aAAa;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,2BAA2B;IAC3B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAM;;IASlD,iBAAiB,CAAC,SAAS,EAAE,MAAM;IAMnC,iBAAiB,CAAC,SAAS,EAAE,MAAM;IAQnC,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB;IAKrE,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAcnD;;;;OAIG;IACH,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAsB9C,GAAG,CAAC,EACF,YAAiB,EACjB,QAAa,GACd,EAAG;QACF,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;QAClD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB;CAkDF"}

package/dist/libs/init-generator.js

@@ -0,0 +1,123 @@
+import url from "url";
+import path from "path";
+import fs from "fs-extra";
+import chalk from "chalk";
+import fg from 'fast-glob';
+const __file__ = url.fileURLToPath(import.meta.url);
+const __root__ = path.join(path.dirname(__file__), "../..");
+const templatesDir = path.join(__root__, "src/target-templates");
+const targetDir = process.cwd(); // User's current working directory
+export class InitGenerator {
+    projectName;
+    /** The key is targetRel */
+    files = {};
+    constructor() {
+        if (fs.existsSync("package.json")) {
+            const packageJson = fs.readJSONSync("package.json");
+            this.projectName = packageJson.name;
+        }
+    }
+    _ensureFileExists(targetRel) {
+        if (!this.files[targetRel]) {
+            throw new Error(`File for target "${targetRel}" not found.`);
+        }
+    }
+    enableSubtitution(targetRel) {
+        this._ensureFileExists(targetRel);
+        if (this.files[targetRel].type !== "copied") {
+            throw new Error(`File for target "${targetRel}" is not a copied file.`);
+        }
+        this.files[targetRel].enableSubstitution = true;
+    }
+    setMessageGenerator(targetRel, messageGen) {
+        this._ensureFileExists(targetRel);
+        this.files[targetRel].messageGenerator = messageGen;
+    }
+    addGeneratedFile(targetRel, content) {
+        const targetAbs = path.join(targetDir, targetRel);
+        const targetFolderAbs = path.dirname(targetAbs);
+        const exists = fs.existsSync(targetAbs);
+        this.files[targetRel] = {
+            type: "generated",
+            targetRel,
+            targetAbs,
+            targetFolderAbs,
+            targetExists: exists,
+            content,
+        };
+    }
+    /**
+     * @param source relative path under the templates folder. All files and folders under `source` are copied directly under `target`.
+     * @param target relative path under the project root folder.
+     * If the target file exists already in `files`, it will be overridden.
+     */
+    addCopiedFolder(source, target) {
+        const pathPrefix = path.join(templatesDir, source);
+        const glob = path.join(pathPrefix, '**/*');
+        fg.globSync(glob, { dot: true }).forEach((sourceAbs) => {
+            const sourceRel = path.relative(templatesDir, sourceAbs);
+            const pathUnderSource = path.relative(pathPrefix, sourceAbs);
+            const targetRel = path.join(target, pathUnderSource);
+            const targetAbs = path.join(targetDir, targetRel);
+            const targetFolderAbs = path.dirname(targetAbs);
+            const exists = fs.existsSync(targetAbs);
+            this.files[targetRel] = {
+                type: "copied",
+                sourceRel,
+                targetRel,
+                sourceAbs,
+                targetAbs,
+                targetFolderAbs,
+                targetExists: exists,
+            };
+        });
+    }
+    run({ substitution = {}, messages = [], }) {
+        const fileMessages = [];
+        Object.values(this.files).forEach((fileInfo) => {
+            if (fileInfo.messageGenerator) {
+                const message = fileInfo.messageGenerator(fileInfo.targetExists, fileInfo);
+                if (message) {
+                    fileMessages.push(message);
+                }
+            }
+            if (fileInfo.targetExists) {
+                console.log(`Skipped ${chalk.yellow(fileInfo.targetRel)} (exists)`);
+                return;
+            }
+            // Create or copy
+            if (!fs.existsSync(fileInfo.targetFolderAbs)) {
+                fs.mkdirSync(fileInfo.targetFolderAbs, { recursive: true });
+            }
+            if (fileInfo.type === 'generated') {
+                fs.writeFileSync(fileInfo.targetAbs, fileInfo.content, 'utf8');
+            }
+            else if (fileInfo.enableSubstitution) {
+                const content = fs.readFileSync(fileInfo.sourceAbs, 'utf8');
+                const substitutedContent = content.replace(/\$([A-Z_]+)/g, (_, varName) => {
+                    const value = substitution[varName];
+                    if (!value) {
+                        throw new Error(`${chalk.blue("TemplateCopier.run()")}: Variable ${chalk.yellow(varName)} is needed by ${chalk.yellow(fileInfo.targetRel)} but is undefined.`);
+                    }
+                    return value;
+                });
+                fs.writeFileSync(fileInfo.targetAbs, substitutedContent);
+            }
+            else {
+                fs.copySync(fileInfo.sourceAbs, fileInfo.targetAbs, {
+                    overwrite: false,
+                    errorOnExist: false,
+                    dereference: false,
+                });
+            }
+            console.log(`Created ${chalk.green(fileInfo.targetRel)}`);
+        });
+        const allMessages = [...messages, ...fileMessages];
+        if (!allMessages.length)
+            return;
+        console.log(chalk.blue("\nNext steps:"));
+        allMessages.forEach((msg, i) => {
+            console.log(`${i + 1}. ${msg}\n`);
+        });
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vaharoni/devops",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Devops utility",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -34,9 +34,11 @@
     "@iarna/toml": "^2.2.5",
     "chalk": "^5.3.0",
     "concurrently": "^9.1.2",
+    "fast-glob": "^3.3.3",
     "fs-extra": "11.2.0",
     "glob": "^11.0.1",
     "handlebars": "^4.7.8",
+    "inquirer": "^12.7.0",
     "lodash": "^4.17.21",
     "tsx": "^4.19.3",
     "yaml": "^2.4.2",