@highstate/proxmox 0.4.4 → 0.4.6

package/dist/connection/index.js

@@ -1,21 +1,54 @@
 import { proxmox } from '@highstate/library';
-import { forUnit, output } from '@highstate/pulumi';
-import { cluster } from '@muhlba91/pulumi-proxmoxve';
-import { c as createProvider } from '../provider-QSzoFScT.js';
+import { forUnit, toPromise, output } from '@highstate/pulumi';
+import { Provider, cluster, storage } from '@muhlba91/pulumi-proxmoxve';
 
 const { args, secrets, outputs } = forUnit(proxmox.connection);
+const provider = await toPromise(
+  output({ args, secrets }).apply(({ args: args2, secrets: secrets2 }) => {
+    return new Provider("proxmox", {
+      endpoint: args2.endpoint,
+      insecure: args2.insecure,
+      username: args2.username,
+      password: secrets2.password,
+      apiToken: secrets2.apiToken
+    });
+  })
+);
+const nodes = await cluster.getNodes({ provider });
+if (nodes.names.length === 0) {
+  throw new Error("No nodes found");
+}
+const nodeName = args.defaultNodeName ?? nodes.names[0];
+if (!nodes.names.includes(nodeName)) {
+  throw new Error(`Node '${nodeName}' not found in the cluster`);
+}
+const datastores = await storage.getDatastores({ nodeName }, { provider });
+if (datastores.datastoreIds.length === 0) {
+  throw new Error(`No datastores found in the node '${nodeName}'`);
+}
+const datastoreId = args.defaultDatastoreId ?? datastores.datastoreIds[0];
+if (!datastores.datastoreIds.includes(datastoreId)) {
+  throw new Error(`Datastore '${datastoreId}' not found in the node '${nodeName}'`);
+}
 const proxmoxCluster = output({
   endpoint: args.endpoint,
   insecure: args.insecure,
   username: args.username,
-  defaultNodeName: args.defaultNodeName,
+  defaultNodeName: nodeName,
+  defaultDatastoreId: datastoreId,
   password: secrets.password,
   apiToken: secrets.apiToken
 });
-const provider = createProvider(proxmoxCluster);
-await cluster.getNodes({ provider });
 var index = outputs({
-  proxmoxCluster
+  proxmoxCluster,
+  $status: {
+    defaultNodeName: {
+      value: proxmoxCluster.defaultNodeName
+    },
+    defaultDatastoreId: {
+      value: proxmoxCluster.defaultDatastoreId
+    }
+  }
 });
 
 export { index as default };

package/dist/image/index.js

@@ -1,21 +1,22 @@
 import { proxmox } from '@highstate/library';
 import { forUnit, output } from '@highstate/pulumi';
 import { download } from '@muhlba91/pulumi-proxmoxve';
-import { c as createProvider } from '../provider-QSzoFScT.js';
+import { c as createProvider } from '../provider-BgV8Lmo6.js';
 
 const { name, args, inputs, outputs } = forUnit(proxmox.image);
+const provider = await createProvider(inputs.proxmoxCluster);
 const file = new download.File(
   name,
   {
     contentType: "iso",
     checksumAlgorithm: "sha256",
     checksum: args.sha256,
-    datastoreId: args.datastoreId ?? inputs.proxmoxCluster.defaultDatastoreId?.apply((id) => id ?? "") ?? "",
+    datastoreId: args.datastoreId ?? inputs.proxmoxCluster.defaultDatastoreId.apply((id) => id ?? "local-lvm"),
     url: args.url,
     nodeName: args.nodeName ?? inputs.proxmoxCluster.defaultNodeName,
     fileName: output(args.url).apply(getNameByUrl).apply(([name2, extension]) => `${name2}-${args.sha256}.${extension}`)
   },
-  { provider: createProvider(inputs.proxmoxCluster) }
+  { provider }
 );
 function getNameByUrl(url) {
   const fullName = url.split("/").pop().split("?")[0];

package/dist/provider-BgV8Lmo6.js

@@ -0,0 +1,19 @@
+import { toPromise, output } from '@highstate/pulumi';
+import { Provider } from '@muhlba91/pulumi-proxmoxve';
+import '@highstate/library';
+
+function createProvider(cluster) {
+  return toPromise(
+    output(cluster).apply((cluster2) => {
+      return new Provider("proxmox", {
+        endpoint: cluster2.endpoint,
+        insecure: cluster2.insecure,
+        username: cluster2.username,
+        password: cluster2.password,
+        apiToken: cluster2.apiToken
+      });
+    })
+  );
+}
+
+export { createProvider as c };

package/dist/virtual-machine/index.js

@@ -1,21 +1,24 @@
 import { proxmox } from '@highstate/library';
-import { forUnit } from '@highstate/pulumi';
+import { forUnit, output, interpolate } from '@highstate/pulumi';
 import { vm } from '@muhlba91/pulumi-proxmoxve';
-import { c as createProvider } from '../provider-QSzoFScT.js';
+import { c as createProvider } from '../provider-BgV8Lmo6.js';
 
 const { name, args, inputs, outputs } = forUnit(proxmox.virtualMachine);
+const provider = await createProvider(inputs.proxmoxCluster);
+const nodeName = args.nodeName ?? inputs.proxmoxCluster.defaultNodeName;
+const datastoreId = args.datastoreId ?? inputs.proxmoxCluster.defaultDatastoreId;
 const machine = new vm.VirtualMachine(
   name,
   {
     name,
-    nodeName: args.nodeName ?? inputs.proxmoxCluster.defaultNodeName,
+    nodeName,
     agent: {
       enabled: true
     },
     cpu: {
       cores: args.cores,
       sockets: args.sockets,
-      type: "x86-64-v2-AES"
+      type: args.cpuType ?? "host"
     },
     memory: {
       dedicated: args.memory
@@ -29,7 +32,7 @@ const machine = new vm.VirtualMachine(
       {
         interface: "scsi0",
         size: args.diskSize,
-        datastoreId: args.datastoreId ?? inputs.proxmoxCluster.defaultDatastoreId?.apply((id) => id ?? "") ?? ""
+        datastoreId
       }
     ],
     networkDevices: [
@@ -37,10 +40,10 @@ const machine = new vm.VirtualMachine(
         bridge: args.bridge
       }
     ],
-    initialization: inputs.apply(createCloudInit),
+    initialization: output(inputs).apply(createCloudInit),
     bootOrders: ["scsi0", "ide1"]
   },
-  { provider: createProvider(inputs.proxmoxCluster), ignoreChanges: ["disks"] }
+  { provider }
 );
 function findNotLocalHostIpV4(ips) {
   for (const ip of ips) {
@@ -55,7 +58,7 @@ function deriveIpV4Gateway(ip) {
 }
 function createCloudInit(resolvedInputs) {
   return {
-    datastoreId: args.datastoreId,
+    datastoreId,
     interface: "ide2",
     ipConfigs: args.ipv4 ? [
       {
@@ -64,17 +67,53 @@ function createCloudInit(resolvedInputs) {
           gateway: args.ipv4Gateway ?? deriveIpV4Gateway(args.ipv4)
         }
       }
-    ] : undefined,
-    dns: args.dns ? { servers: args.dns } : undefined,
-    userAccount: resolvedInputs.sshPublicKey ? {
-      keys: [resolvedInputs.sshPublicKey.publicKey]
-    } : undefined
+    ] : void 0,
+    dns: args.dns ? { servers: args.dns } : void 0,
+    userAccount: resolvedInputs.sshKeyPair ? {
+      keys: [resolvedInputs.sshKeyPair.publicKey],
+      username: args.sshUser ?? "root"
+    } : void 0
   };
 }
+const endpoint = machine.ipv4Addresses.apply(findNotLocalHostIpV4);
 var index = outputs({
   server: {
-    endpoint: machine.ipv4Addresses.apply(findNotLocalHostIpV4),
-    hostname: name
+    endpoint,
+    hostname: name,
+    sshCredentials: {
+      keyPair: inputs.sshKeyPair
+    }
+  },
+  $status: {
+    endpoint: {
+      value: endpoint
+    },
+    hostname: {
+      value: name
+    }
+  },
+  $terminals: {
+    ssh: {
+      title: "SSH",
+      image: "ghcr.io/exeteres/highstate/terminal-ssh",
+      command: [
+        "sshpass",
+        "-f",
+        "/password",
+        "ssh",
+        "-tt",
+        "-o",
+        "StrictHostKeyChecking=no",
+        "-p",
+        // port.toString(),
+        "22",
+        // `${user}@${args.endpoint}`,
+        interpolate`root@${endpoint}`
+      ],
+      files: {
+        // "/password": secrets.sshPassword?.apply(x => x ?? "") ?? "",
+      }
+    }
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/proxmox",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "type": "module",
   "files": [
     "dist"
@@ -18,14 +18,14 @@
     "build": "pkgroll --tsconfig=tsconfig.build.json"
   },
   "dependencies": {
-    "@highstate/pulumi": "^0.4.4",
+    "@highstate/pulumi": "^0.4.6",
     "@muhlba91/pulumi-proxmoxve": "^6.17.1"
   },
   "peerDependencies": {
-    "@highstate/library": "workspace:^"
+    "@highstate/library": "workspace:^0.4.4"
   },
   "devDependencies": {
     "pkgroll": "^2.5.1"
   },
-  "gitHead": "58a1b969cca5dad233f885f2e67185a0384ea1aa"
+  "gitHead": "dbb1d8125884cfe3a9d95df2e0710333c01c7edf"
 }

package/dist/provider-QSzoFScT.js

@@ -1,15 +0,0 @@
-import '@highstate/pulumi';
-import { Provider } from '@muhlba91/pulumi-proxmoxve';
-import '@highstate/library';
-
-function createProvider(cluster) {
-  return new Provider("proxmox", {
-    endpoint: cluster.endpoint,
-    insecure: cluster.insecure?.apply((x) => x ?? false),
-    username: cluster.username?.apply((x) => x ?? ""),
-    password: cluster.password?.apply((x) => x ?? ""),
-    apiToken: cluster.apiToken?.apply((x) => x ?? undefined)
-  });
-}
-
-export { createProvider as c };