fix: Support Proxmox 8.2 (#78)

README.md

@@ -26,7 +26,7 @@ resources without the need for complicated bash scripts, terraform or ansible.
 
 ### Additional information
 
-* Proxmox 7.2-7 or later (previous versions were not tested)
+* Tested with Proxmox: 8.2.2
 * Supported MicroK8s versions:
     * 1.28/stable
     * 1.27/stable

core/src/dispatcher/usecase/create_cluster.rs

@@ -1,16 +1,15 @@
+use log::info;
 use std::collections::HashMap;
 use std::sync::Arc;
-use log::info;
 
 use openssl::rsa::Rsa;
 use pem::{encode, Pem};
 
-use proxmox_client::model::AccessData;
-use proxmox_client::{Client, ClientOperations};
 use crate::dispatcher::usecase::common;
 use crate::model::{Cluster, ClusterNode, ClusterNodeType, KeyPair, LogEntry};
 use crate::Repository;
-
+use proxmox_client::model::AccessData;
+use proxmox_client::{Client, ClientOperations};
 
 pub(crate) fn execute(
     proxmox_client: Arc<Client>,
@@ -295,8 +294,7 @@ pub(crate) fn create_vms(
         proxmox_client
             .lxc_containers(&cluster.node)?
             .iter()
-            .map(|i| &i.vm_id)
-            .map(|i| i.parse::<u32>().unwrap_or_default())
+            .map(|i| i.vm_id)
             .collect::<Vec<u32>>(),
     );
 

core/src/generator.rs

@@ -1,11 +1,10 @@
-use std::string::ToString;
 use log::info;
+use std::string::ToString;
 
+use crate::model::{ClusterNode, ClusterNodeType, ClusterRequest, KeyPair, Network};
+use crate::Error;
 use proxmox_client::model::{NetworkType, StorageContentType};
 use proxmox_client::ClientOperations;
-use crate::Error;
-use crate::model::{ClusterNode, ClusterNodeType, ClusterRequest, KeyPair, Network};
-
 
 const EMPTY: String = String::new();
 
@@ -68,11 +67,18 @@ impl DefaultClusterConfigurationGenerator {
 }
 
 fn get_default_os_image() -> String {
-    crate::supported::os_images().values().next().unwrap().to_string()
+    crate::supported::os_images()
+        .values()
+        .next()
+        .unwrap()
+        .to_string()
 }
 
 fn get_default_kube_version() -> String {
-    crate::supported::kube_versions().first().unwrap().to_string()
+    crate::supported::kube_versions()
+        .first()
+        .unwrap()
+        .to_string()
 }
 
 fn get_default_start_vm_id(proxmox_client: &ClientOperations, node: &str) -> crate::Result<u32> {
@@ -81,12 +87,12 @@ fn get_default_start_vm_id(proxmox_client: &ClientOperations, node: &str) -> cra
         .iter()
         .map(|i| i.vm_id)
         .collect();
+
     used_vm_ids.extend(
         proxmox_client
             .lxc_containers(node)?
             .iter()
-            .map(|i| &i.vm_id)
-            .map(|i| i.parse::<u32>().unwrap_or_default())
+            .map(|i| i.vm_id)
             .collect::<Vec<u32>>(),
     );
 
@@ -133,7 +139,10 @@ fn get_default_iso_storage(proxmox_client: &ClientOperations, node: &str) -> cra
         .ok_or(Error::ResourceNotFound)
 }
 
-fn get_default_disk_storage(proxmox_client: &ClientOperations, node: &str) -> crate::Result<String> {
+fn get_default_disk_storage(
+    proxmox_client: &ClientOperations,
+    node: &str,
+) -> crate::Result<String> {
     let result = proxmox_client.storage(node, Some(StorageContentType::Images))?;
     result
         .get(0)

proxmox-client/src/model.rs

@@ -269,7 +269,7 @@ pub struct LxcContainer {
 
     #[doc = "The (unique) ID of the VM."]
     #[serde(rename = "vmid")]
-    pub vm_id: String,
+    pub vm_id: u32,
 
     #[doc = "Maximum usable CPUs."]
     #[serde(skip_serializing_if = "Option::is_none")]

tasks.lua

@@ -0,0 +1,13 @@
+return {
+	tasks = {
+		{
+			name = "backend",
+			exec = "cargo watch -x run",
+		},
+		{
+			name = "frontend",
+			exec = "pnpm run dev",
+			working_dir = "web/src-web",
+		},
+	},
+}

web/src/main.rs

@@ -14,7 +14,6 @@ use env_logger::Env;
 use mime_guess::from_path;
 use rust_embed::RustEmbed;
 
-
 use crate::handlers::actix::inject;
 
 mod handlers;