puls-dev 0.2.7 → 0.2.9

package/dist/providers/proxmox/vm.js

@@ -1,12 +1,13 @@
 import { readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { spawn } from "node:child_process";
-import { createConnection } from "node:net";
 import { BaseBuilder } from "../../core/resource.js";
 import { Config } from "../../core/config.js";
 import { Output } from "../../core/output.js";
 import { getPMClient } from "./api.js";
 import { getFileHash, parseProvisionMetadata, mergeProvisionMetadata } from "./hash.js";
+import { checkPort, runProvisioner } from "../../core/provisioner.js";
+import { resourceContextStorage } from "../../core/context.js";
 export class VMBuilder extends BaseBuilder {
     out = {
         ip: new Output(),
@@ -16,6 +17,7 @@ export class VMBuilder extends BaseBuilder {
     resolvedNode = null;
     resolvedIp = null;
     _image;
+    _templateSource;
     _cores = 2;
     _memory = 2048;
     _provision = [];
@@ -26,6 +28,7 @@ export class VMBuilder extends BaseBuilder {
     _ip;
     _sshKeys;
     _machine = "q35";
+    _forceConfigCheck = false;
     constructor(name) {
         super(name);
         this.discoveryPromise = this.discoverVm(name);
@@ -40,7 +43,8 @@ export class VMBuilder extends BaseBuilder {
                     const config = await pm.get(`/nodes/${match.node}/qemu/${match.vmid}/config`);
                     match.description = config.description ?? "";
                 }
-                catch {
+                catch (err) {
+                    console.warn(`   ⚠️  Could not fetch VM config for ${match.vmid}: ${err.message}`);
                     match.description = "";
                 }
             }
@@ -56,6 +60,11 @@ export class VMBuilder extends BaseBuilder {
         this._image = os;
         return this;
     }
+    fromTemplate(template) {
+        this._templateSource = template;
+        this.dependsOn(template);
+        return this;
+    }
     cores(n) {
         this._cores = n;
         return this;
@@ -96,6 +105,10 @@ export class VMBuilder extends BaseBuilder {
         this._machine = type;
         return this;
     }
+    forceConfigCheck() {
+        this._forceConfigCheck = true;
+        return this;
+    }
     async deploy() {
         const dryRun = this.isDryRunActive();
         const existing = await this.discoveryPromise;
@@ -116,10 +129,12 @@ export class VMBuilder extends BaseBuilder {
                 const baseName = p.split("/").pop() ?? p;
                 return { path: p, baseName, hash: getFileHash(p) };
             });
-            const playbooksToRun = declaredPlaybooksWithHashes.filter((p) => {
-                const appliedHash = appliedHashes[p.baseName];
-                return !appliedHash || appliedHash !== p.hash;
-            });
+            const playbooksToRun = this._forceConfigCheck
+                ? declaredPlaybooksWithHashes
+                : declaredPlaybooksWithHashes.filter((p) => {
+                    const appliedHash = appliedHashes[p.baseName];
+                    return !appliedHash || appliedHash !== p.hash;
+                });
             if (playbooksToRun.length > 0) {
                 console.log(`\n🖥️  Finalizing Proxmox VM "${this.name}"...`);
                 console.log(`   ✅ VM "${this.name}" already exists (vmid=${existing.vmid}, node=${existing.node}, status=${existing.status})`);
@@ -171,6 +186,8 @@ export class VMBuilder extends BaseBuilder {
             console.log(`   📝 [PLAN] Create VM "${this.name}"`);
             if (this._image)
                 console.log(`      └─ Image: ${this._image}`);
+            if (this._templateSource)
+                console.log(`      └─ Template: ${this._templateSource.name}`);
             console.log(`      └─ Cores: ${this._cores}  Memory: ${this._memory} MB  Machine: ${this._machine}`);
             if (this._vlan)
                 console.log(`      └─ VLAN: ${this._vlan}`);
@@ -184,19 +201,27 @@ export class VMBuilder extends BaseBuilder {
             return { name: this.name, vmid: "PENDING" };
         }
         // Find the template - match by VMID (numeric string) or name substring
+        let sourceVmid;
+        if (this._templateSource) {
+            const v = await this._templateSource.out.vmid.get();
+            sourceVmid = String(v);
+        }
+        else if (this._image) {
+            sourceVmid = String(this._image);
+        }
         const resources = await pm.get("/cluster/resources?type=vm");
-        const isVmid = this._image && /^\d+$/.test(this._image);
-        const template = this._image
+        const isVmid = sourceVmid && /^\d+$/.test(sourceVmid);
+        const template = sourceVmid
             ? (resources ?? []).find((r) => r.template === 1 &&
                 (isVmid
-                    ? String(r.vmid) === this._image
-                    : r.name?.includes(this._image)))
+                    ? String(r.vmid) === sourceVmid
+                    : r.name?.includes(sourceVmid)))
             : null;
-        if (this._image && !template) {
-            throw new Error(`No Proxmox template found matching "${this._image}". ` +
+        if (sourceVmid && !template) {
+            throw new Error(`No Proxmox template found matching "${sourceVmid}". ` +
                 (isVmid
-                    ? `Check that VMID ${this._image} exists and is marked as a template.`
-                    : `Create a template whose name contains "${this._image}".`));
+                    ? `Check that VMID ${sourceVmid} exists and is marked as a template.`
+                    : `Create a template whose name contains "${sourceVmid}".`));
         }
         // Resolve target node: explicit → cluster-aware (online & max free RAM) → configured nodes list → template's node → API discovery
         let node = this._node;
@@ -351,6 +376,19 @@ export class VMBuilder extends BaseBuilder {
         if (this._replace) {
             await this.destroyVmByName(this._replace, pm);
         }
+        const context = resourceContextStorage.getStore();
+        if (context && context.hosts) {
+            const activeIp = this.resolvedIp ?? "0.0.0.0";
+            if (!context.hosts.some(h => h.name === this.name)) {
+                context.hosts.push({
+                    name: this.name,
+                    ip: activeIp,
+                    user: "root",
+                    sshKey: this.sshKeyPath(),
+                    provider: "proxmox"
+                });
+            }
+        }
         return { name: this.name, vmid: this.resolvedVmid, ip: this.resolvedIp };
     }
     async resolveExistingIp(node, vmid, pm) {
@@ -480,19 +518,11 @@ export class VMBuilder extends BaseBuilder {
             proc.on("error", () => resolve(false));
         });
     }
-    checkPort(ip, port) {
-        return new Promise((resolve) => {
-            const socket = createConnection({ host: ip, port, timeout: 3_000 });
-            socket.on("connect", () => {
-                socket.destroy();
-                resolve(true);
-            });
-            socket.on("timeout", () => {
-                socket.destroy();
-                resolve(false);
-            });
-            socket.on("error", () => resolve(false));
-        });
+    async checkPort(ip, port) {
+        return checkPort(ip, port);
+    }
+    async runProvisioner(ip, script) {
+        return runProvisioner(ip, "root", this._sshKeys, script);
     }
     sshKeyPath() {
         const keyInput = Array.isArray(this._sshKeys)
@@ -505,79 +535,4 @@ export class VMBuilder extends BaseBuilder {
             ? keyInput.replace(/\.pub$/, "")
             : `${homedir()}/.ssh/id_ed25519`).replace(/^~/, homedir());
     }
-    runProvisioner(ip, script) {
-        const ext = script.split(".").pop()?.toLowerCase();
-        if (ext === "sh") {
-            throw new Error(`Shell script provisioning (.sh) is no longer supported. ` +
-                `Please migrate "${script}" to an Ansible playbook (.yaml/.yml).`);
-        }
-        if (ext === "pp")
-            return this.runPuppet(ip, script);
-        return this.runAnsible(ip, script); // .yml / .yaml
-    }
-    runPuppet(ip, manifest) {
-        console.log(`   🔧 Applying Puppet manifest: ${manifest} → ${ip}`);
-        const keyPath = this.sshKeyPath();
-        // Copy manifest then apply it
-        return new Promise((resolve, reject) => {
-            const scp = spawn("scp", [
-                "-i",
-                keyPath,
-                "-o",
-                "StrictHostKeyChecking=no",
-                manifest,
-                `root@${ip}:/tmp/manifest.pp`,
-            ], { stdio: "inherit" });
-            scp.on("close", (code) => {
-                if (code !== 0) {
-                    reject(new Error(`scp exited with code ${code}`));
-                    return;
-                }
-                const puppet = spawn("ssh", [
-                    "-i",
-                    keyPath,
-                    "-o",
-                    "StrictHostKeyChecking=no",
-                    `root@${ip}`,
-                    "puppet apply /tmp/manifest.pp",
-                ], { stdio: "inherit" });
-                puppet.on("close", (c) => {
-                    if (c === 0) {
-                        console.log(`   ✅ Provisioning complete`);
-                        resolve();
-                    }
-                    else
-                        reject(new Error(`puppet apply exited with code ${c}`));
-                });
-                puppet.on("error", (err) => reject(new Error(`Failed to run puppet: ${err.message}`)));
-            });
-            scp.on("error", (err) => reject(new Error(`Failed to run scp: ${err.message}`)));
-        });
-    }
-    runAnsible(ip, playbook) {
-        console.log(`   🔧 Running Ansible: ${playbook} → ${ip}`);
-        const keyPath = this.sshKeyPath();
-        return new Promise((resolve, reject) => {
-            const proc = spawn("ansible-playbook", [
-                playbook,
-                "-i",
-                `${ip},`,
-                "-u",
-                "root",
-                "--private-key",
-                keyPath,
-                "--ssh-extra-args",
-                "-o StrictHostKeyChecking=no -o ConnectTimeout=30",
-            ], { stdio: "inherit" });
-            proc.on("close", (code) => {
-                if (code === 0) {
-                    console.log(`   ✅ Provisioning complete`);
-                    resolve();
-                }
-                else
-                    reject(new Error(`ansible-playbook exited with code ${code}`));
-            });
-            proc.on("error", (err) => reject(new Error(`Failed to run ansible-playbook: ${err.message}`)));
-        });
-    }
 }

package/dist/providers/proxmox/vm.test.js

@@ -1,9 +1,20 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 import { test, describe, beforeEach, afterEach } from "node:test";
 import assert from "node:assert";
 import { ProxmoxApiClient } from "./api.js";
 import { VMBuilder } from "./vm.js";
 import { Config } from "../../core/config.js";
 import { getFileHash, parseProvisionMetadata, mergeProvisionMetadata } from "./hash.js";
+import { Stack } from "../../core/stack.js";
+import { ForceConfigCheck } from "../../core/decorators.js";
 describe("Proxmox VMBuilder Unit Tests", () => {
     let originalGet;
     let originalPost;
@@ -263,6 +274,72 @@ describe("Proxmox VMBuilder Unit Tests", () => {
         assert.strictEqual(updateConfigCall.body.description, expectedDescription);
         assert.ok(expectedDescription.startsWith("User notes preserved"));
     });
+    test("forceConfigCheck() builder method forces playbook execution even if hashes match", async () => {
+        const nginxHash = getFileHash("playbooks/nginx.yaml");
+        const descriptionNotes = mergeProvisionMetadata("User notes", {
+            "nginx.yaml": nginxHash,
+        });
+        mockGetResponses["/cluster/resources?type=vm"] = [
+            { name: "force-vm", vmid: 200, node: "pve1", template: 0, status: "running" },
+        ];
+        mockGetResponses["/nodes/pve1/qemu/200/config"] = {
+            description: descriptionNotes,
+        };
+        const builder = new VMBuilder("force-vm")
+            .ip("10.8.10.95")
+            .provision("playbooks/nginx.yaml")
+            .forceConfigCheck();
+        const provisionCalls = [];
+        // Overrides
+        builder.waitFor = async (label, condition) => {
+            return await condition();
+        };
+        builder.checkPort = async () => true;
+        builder.checkCloudInit = async () => true;
+        builder.runProvisioner = async (ip, script) => {
+            provisionCalls.push({ ip, script });
+        };
+        const deployResult = await builder.deploy();
+        assert.strictEqual(deployResult.vmid, 200);
+        // Verify playbook WAS executed because of forceConfigCheck()
+        assert.strictEqual(provisionCalls.length, 1);
+        assert.strictEqual(provisionCalls[0].script, "playbooks/nginx.yaml");
+    });
+    test("ForceConfigCheck decorator forces playbook execution even if hashes match", async () => {
+        const nginxHash = getFileHash("playbooks/nginx.yaml");
+        const descriptionNotes = mergeProvisionMetadata("User notes", {
+            "nginx.yaml": nginxHash,
+        });
+        mockGetResponses["/cluster/resources?type=vm"] = [
+            { name: "force-dec-vm", vmid: 200, node: "pve1", template: 0, status: "running" },
+        ];
+        mockGetResponses["/nodes/pve1/qemu/200/config"] = {
+            description: descriptionNotes,
+        };
+        const provisionCalls = [];
+        class TestStack extends Stack {
+            server = new VMBuilder("force-dec-vm")
+                .ip("10.8.10.95")
+                .provision("playbooks/nginx.yaml");
+        }
+        __decorate([
+            ForceConfigCheck,
+            __metadata("design:type", Object)
+        ], TestStack.prototype, "server", void 0);
+        const stack = new TestStack();
+        stack.server.waitFor = async (label, condition) => {
+            return await condition();
+        };
+        stack.server.checkPort = async () => true;
+        stack.server.checkCloudInit = async () => true;
+        stack.server.runProvisioner = async (ip, script) => {
+            provisionCalls.push({ ip, script });
+        };
+        await stack.deploy();
+        // Verify playbook WAS executed because of @ForceConfigCheck decorator
+        assert.strictEqual(provisionCalls.length, 1);
+        assert.strictEqual(provisionCalls[0].script, "playbooks/nginx.yaml");
+    });
 });
 describe("Proxmox Provision Hash & Metadata Utilities", () => {
     test("parseProvisionMetadata parses valid, invalid, and empty strings", () => {

package/dist/types/inventory.d.ts

@@ -75,13 +75,56 @@ export interface AwsInventory {
     rdsInstances: AwsRdsInstance[];
     hostedZones: AwsHostedZone[];
 }
+export interface GcpVM {
+    name: string;
+    zone: string;
+    machineType: string;
+    status: string;
+    ip: string;
+}
+export interface GcpCloudSQL {
+    name: string;
+    engine: string;
+    tier: string;
+    status: string;
+}
+export interface GcpCloudRun {
+    name: string;
+    region: string;
+    url: string;
+}
+export interface GcpCloudDNS {
+    name: string;
+    dnsName: string;
+}
+export interface GcpInventory {
+    vms: GcpVM[];
+    rdsInstances: GcpCloudSQL[];
+    distributions: GcpCloudRun[];
+    hostedZones: GcpCloudDNS[];
+}
+export interface FirebaseHosting {
+    site: string;
+}
+export interface FirebaseFunction {
+    name: string;
+    region: string;
+    entryPoint: string;
+    runtime: string;
+}
+export interface FirebaseInventory {
+    hostingSites: FirebaseHosting[];
+    functions: FirebaseFunction[];
+}
 export interface InventoryError {
-    provider: "proxmox" | "do" | "aws";
+    provider: "proxmox" | "do" | "aws" | "gcp" | "firebase";
     message: string;
 }
 export interface InventoryResult {
     proxmox?: ProxmoxInventory;
     do?: DoInventory;
     aws?: AwsInventory;
+    gcp?: GcpInventory;
+    firebase?: FirebaseInventory;
     errors: InventoryError[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "puls-dev",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "Intent-driven infrastructure-as-code with eager discovery and no state files.",
   "type": "module",
   "main": "./dist/index.js",
@@ -70,6 +70,7 @@
     "@aws-sdk/client-secrets-manager": "^3.1053.0",
     "@aws-sdk/client-sns": "^3.1053.0",
     "@aws-sdk/client-sqs": "^3.1053.0",
+    "@aws-sdk/client-ssm": "^3.1053.0",
     "@types/node": "^25.6.2",
     "google-auth-library": "^10.6.2",
     "ts-node": "^10.9.2",
@@ -94,6 +95,7 @@
     "@aws-sdk/client-secrets-manager": "^3.1053.0",
     "@aws-sdk/client-sns": "^3.1053.0",
     "@aws-sdk/client-sqs": "^3.1053.0",
+    "@aws-sdk/client-ssm": "^3.1053.0",
     "dotenv": "^17.4.2",
     "google-auth-library": "^10.6.2",
     "reflect-metadata": "^0.2.2",