Merge pull request 'feat: Inventory PhysicalHost persistence with sqlx and local sqlite db' (#125) from feat/inventory_persistence into master
All checks were successful
Run Check Script / check (push) Successful in 1m14s
Compile and package harmony_composer / package_harmony_composer (push) Successful in 6m31s

Reviewed-on: https://git.nationtech.io/NationTech/harmony/pulls/125
This commit is contained in:
Ian Letourneau 2025-08-31 22:49:28 +00:00
commit 62fa3c2b10
85 changed files with 1250 additions and 447 deletions

View File

@ -0,0 +1,32 @@
{
"db_name": "SQLite",
"query": "SELECT id, version_id, data as \"data: Json<PhysicalHost>\" FROM physical_hosts WHERE id = ? ORDER BY version_id DESC LIMIT 1",
"describe": {
"columns": [
{
"name": "id",
"ordinal": 0,
"type_info": "Text"
},
{
"name": "version_id",
"ordinal": 1,
"type_info": "Text"
},
{
"name": "data: Json<PhysicalHost>",
"ordinal": 2,
"type_info": "Null"
}
],
"parameters": {
"Right": 1
},
"nullable": [
false,
false,
false
]
},
"hash": "934035c7ca6e064815393e4e049a7934b0a7fac04a4fe4b2a354f0443d630990"
}

View File

@ -0,0 +1,12 @@
{
"db_name": "SQLite",
"query": "INSERT INTO physical_hosts (id, version_id, data) VALUES (?, ?, ?)",
"describe": {
"columns": [],
"parameters": {
"Right": 3
},
"nullable": []
},
"hash": "f10f615ee42129ffa293e46f2f893d65a237d31d24b74a29c6a8d8420d255ab8"
}

354
Cargo.lock generated
View File

@ -474,6 +474,15 @@ dependencies = [
"syn 2.0.105", "syn 2.0.105",
] ]
[[package]]
name = "atoi"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
dependencies = [
"num-traits",
]
[[package]] [[package]]
name = "atomic-waker" name = "atomic-waker"
version = "1.1.2" version = "1.1.2"
@ -1052,6 +1061,21 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "crc"
version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
dependencies = [
"crc-catalog",
]
[[package]]
name = "crc-catalog"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
[[package]] [[package]]
name = "crc32fast" name = "crc32fast"
version = "1.4.2" version = "1.4.2"
@ -1089,6 +1113,15 @@ dependencies = [
"crossbeam-utils", "crossbeam-utils",
] ]
[[package]]
name = "crossbeam-queue"
version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
dependencies = [
"crossbeam-utils",
]
[[package]] [[package]]
name = "crossbeam-utils" name = "crossbeam-utils"
version = "0.8.21" version = "0.8.21"
@ -1409,6 +1442,12 @@ dependencies = [
"syn 2.0.105", "syn 2.0.105",
] ]
[[package]]
name = "dotenvy"
version = "0.15.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
[[package]] [[package]]
name = "dyn-clone" name = "dyn-clone"
version = "1.0.19" version = "1.0.19"
@ -1471,6 +1510,9 @@ name = "either"
version = "1.15.0" version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
dependencies = [
"serde",
]
[[package]] [[package]]
name = "elliptic-curve" name = "elliptic-curve"
@ -1586,6 +1628,17 @@ dependencies = [
"windows-sys 0.60.2", "windows-sys 0.60.2",
] ]
[[package]]
name = "etcetera"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
dependencies = [
"cfg-if",
"home",
"windows-sys 0.48.0",
]
[[package]] [[package]]
name = "event-listener" name = "event-listener"
version = "5.4.0" version = "5.4.0"
@ -1618,6 +1671,7 @@ dependencies = [
"env_logger", "env_logger",
"harmony", "harmony",
"harmony_cli", "harmony_cli",
"harmony_types",
"logging", "logging",
"tokio", "tokio",
"url", "url",
@ -1679,6 +1733,7 @@ dependencies = [
"harmony", "harmony",
"harmony_cli", "harmony_cli",
"harmony_macros", "harmony_macros",
"harmony_types",
"tokio", "tokio",
"url", "url",
] ]
@ -1690,6 +1745,7 @@ dependencies = [
"cidr", "cidr",
"harmony", "harmony",
"harmony_cli", "harmony_cli",
"harmony_types",
"tokio", "tokio",
"url", "url",
] ]
@ -1984,6 +2040,17 @@ dependencies = [
"futures-util", "futures-util",
] ]
[[package]]
name = "futures-intrusive"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
dependencies = [
"futures-core",
"lock_api",
"parking_lot",
]
[[package]] [[package]]
name = "futures-io" name = "futures-io"
version = "0.3.31" version = "0.3.31"
@ -2229,7 +2296,6 @@ dependencies = [
"opnsense-config", "opnsense-config",
"opnsense-config-xml", "opnsense-config-xml",
"pretty_assertions", "pretty_assertions",
"rand 0.9.1",
"reqwest 0.11.27", "reqwest 0.11.27",
"russh", "russh",
"rust-ipmi", "rust-ipmi",
@ -2241,11 +2307,13 @@ dependencies = [
"serde_with", "serde_with",
"serde_yaml", "serde_yaml",
"similar", "similar",
"sqlx",
"strum 0.27.1", "strum 0.27.1",
"tar", "tar",
"temp-dir", "temp-dir",
"temp-file", "temp-file",
"tempfile", "tempfile",
"thiserror 2.0.14",
"tokio", "tokio",
"tokio-util", "tokio-util",
"url", "url",
@ -2298,9 +2366,12 @@ version = "0.1.0"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"env_logger", "env_logger",
"harmony_macros",
"harmony_types",
"local-ip-address", "local-ip-address",
"log", "log",
"mdns-sd 0.14.1 (git+https://github.com/jggc/mdns-sd.git?branch=patch-1)", "mdns-sd 0.14.1 (git+https://github.com/jggc/mdns-sd.git?branch=patch-1)",
"reqwest 0.12.20",
"serde", "serde",
"serde_json", "serde_json",
"sysinfo", "sysinfo",
@ -2371,7 +2442,9 @@ dependencies = [
name = "harmony_types" name = "harmony_types"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"rand 0.9.1",
"serde", "serde",
"url",
] ]
[[package]] [[package]]
@ -2391,6 +2464,15 @@ dependencies = [
"foldhash", "foldhash",
] ]
[[package]]
name = "hashlink"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
dependencies = [
"hashbrown 0.15.4",
]
[[package]] [[package]]
name = "headers" name = "headers"
version = "0.4.1" version = "0.4.1"
@ -2960,7 +3042,7 @@ checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
[[package]] [[package]]
name = "infisical" name = "infisical"
version = "0.0.2" version = "0.0.2"
source = "git+https://github.com/jggc/rust-sdk.git?branch=patch-1#5a8509ef5483a5798c5d1a7f7ebeb5ba5b783253" source = "git+https://github.com/jggc/rust-sdk.git?branch=patch-1#30d820194d29491411bd14f6c2e18ec500bb0b14"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"reqwest 0.12.20", "reqwest 0.12.20",
@ -3333,6 +3415,17 @@ dependencies = [
"redox_syscall", "redox_syscall",
] ]
[[package]]
name = "libsqlite3-sys"
version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
dependencies = [
"cc",
"pkg-config",
"vcpkg",
]
[[package]] [[package]]
name = "linux-raw-sys" name = "linux-raw-sys"
version = "0.4.15" version = "0.4.15"
@ -3429,6 +3522,16 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
[[package]]
name = "md-5"
version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
dependencies = [
"cfg-if",
"digest",
]
[[package]] [[package]]
name = "md5" name = "md5"
version = "0.7.0" version = "0.7.0"
@ -3753,7 +3856,7 @@ dependencies = [
"env_logger", "env_logger",
"log", "log",
"pretty_assertions", "pretty_assertions",
"rand 0.8.5", "rand 0.9.1",
"serde", "serde",
"thiserror 2.0.14", "thiserror 2.0.14",
"tokio", "tokio",
@ -5280,6 +5383,9 @@ name = "smallvec"
version = "1.15.1" version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
dependencies = [
"serde",
]
[[package]] [[package]]
name = "snafu" name = "snafu"
@ -5352,6 +5458,194 @@ dependencies = [
"der", "der",
] ]
[[package]]
name = "sqlx"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc"
dependencies = [
"sqlx-core",
"sqlx-macros",
"sqlx-mysql",
"sqlx-postgres",
"sqlx-sqlite",
]
[[package]]
name = "sqlx-core"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6"
dependencies = [
"base64 0.22.1",
"bytes",
"crc",
"crossbeam-queue",
"either",
"event-listener",
"futures-core",
"futures-intrusive",
"futures-io",
"futures-util",
"hashbrown 0.15.4",
"hashlink",
"indexmap 2.10.0",
"log",
"memchr",
"once_cell",
"percent-encoding",
"serde",
"serde_json",
"sha2",
"smallvec",
"thiserror 2.0.14",
"tokio",
"tokio-stream",
"tracing",
"url",
]
[[package]]
name = "sqlx-macros"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d"
dependencies = [
"proc-macro2",
"quote",
"sqlx-core",
"sqlx-macros-core",
"syn 2.0.105",
]
[[package]]
name = "sqlx-macros-core"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b"
dependencies = [
"dotenvy",
"either",
"heck",
"hex",
"once_cell",
"proc-macro2",
"quote",
"serde",
"serde_json",
"sha2",
"sqlx-core",
"sqlx-mysql",
"sqlx-postgres",
"sqlx-sqlite",
"syn 2.0.105",
"tokio",
"url",
]
[[package]]
name = "sqlx-mysql"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526"
dependencies = [
"atoi",
"base64 0.22.1",
"bitflags 2.9.1",
"byteorder",
"bytes",
"crc",
"digest",
"dotenvy",
"either",
"futures-channel",
"futures-core",
"futures-io",
"futures-util",
"generic-array",
"hex",
"hkdf",
"hmac",
"itoa",
"log",
"md-5",
"memchr",
"once_cell",
"percent-encoding",
"rand 0.8.5",
"rsa",
"serde",
"sha1",
"sha2",
"smallvec",
"sqlx-core",
"stringprep",
"thiserror 2.0.14",
"tracing",
"whoami",
]
[[package]]
name = "sqlx-postgres"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46"
dependencies = [
"atoi",
"base64 0.22.1",
"bitflags 2.9.1",
"byteorder",
"crc",
"dotenvy",
"etcetera",
"futures-channel",
"futures-core",
"futures-util",
"hex",
"hkdf",
"hmac",
"home",
"itoa",
"log",
"md-5",
"memchr",
"once_cell",
"rand 0.8.5",
"serde",
"serde_json",
"sha2",
"smallvec",
"sqlx-core",
"stringprep",
"thiserror 2.0.14",
"tracing",
"whoami",
]
[[package]]
name = "sqlx-sqlite"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea"
dependencies = [
"atoi",
"flume",
"futures-channel",
"futures-core",
"futures-executor",
"futures-intrusive",
"futures-util",
"libsqlite3-sys",
"log",
"percent-encoding",
"serde",
"serde_urlencoded",
"sqlx-core",
"thiserror 2.0.14",
"tracing",
"url",
]
[[package]] [[package]]
name = "ssh-cipher" name = "ssh-cipher"
version = "0.2.0" version = "0.2.0"
@ -5415,6 +5709,17 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "stringprep"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
dependencies = [
"unicode-bidi",
"unicode-normalization",
"unicode-properties",
]
[[package]] [[package]]
name = "strsim" name = "strsim"
version = "0.11.1" version = "0.11.1"
@ -6018,12 +6323,33 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
[[package]]
name = "unicode-bidi"
version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"
version = "1.0.18" version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
[[package]]
name = "unicode-normalization"
version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-properties"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
[[package]] [[package]]
name = "unicode-segmentation" name = "unicode-segmentation"
version = "1.12.0" version = "1.12.0"
@ -6147,6 +6473,12 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
[[package]]
name = "vcpkg"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]] [[package]]
name = "version_check" name = "version_check"
version = "0.9.5" version = "0.9.5"
@ -6186,6 +6518,12 @@ dependencies = [
"wit-bindgen-rt", "wit-bindgen-rt",
] ]
[[package]]
name = "wasite"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
[[package]] [[package]]
name = "wasm-bindgen" name = "wasm-bindgen"
version = "0.2.100" version = "0.2.100"
@ -6306,6 +6644,16 @@ dependencies = [
"rustls-pki-types", "rustls-pki-types",
] ]
[[package]]
name = "whoami"
version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d"
dependencies = [
"libredox",
"wasite",
]
[[package]] [[package]]
name = "winapi" name = "winapi"
version = "0.2.8" version = "0.2.8"

View File

@ -36,7 +36,7 @@ tokio = { version = "1.40", features = [
cidr = { features = ["serde"], version = "0.2" } cidr = { features = ["serde"], version = "0.2" }
russh = "0.45" russh = "0.45"
russh-keys = "0.45" russh-keys = "0.45"
rand = "0.8" rand = "0.9"
url = "2.5" url = "2.5"
kube = { version = "1.1.0", features = [ kube = { version = "1.1.0", features = [
"config", "config",
@ -65,3 +65,6 @@ directories = "6.0.0"
thiserror = "2.0.14" thiserror = "2.0.14"
serde = { version = "1.0.209", features = ["derive", "rc"] } serde = { version = "1.0.209", features = ["derive", "rc"] }
serde_json = "1.0.127" serde_json = "1.0.127"
askama = "0.14"
sqlx = { version = "0.8", features = ["runtime-tokio", "sqlite" ] }
reqwest = { version = "0.12", features = ["blocking", "stream", "rustls-tls", "http2", "json"], default-features = false }

Binary file not shown.

View File

@ -7,8 +7,9 @@ license.workspace = true
[dependencies] [dependencies]
env_logger.workspace = true env_logger.workspace = true
harmony = { version = "0.1.0", path = "../../harmony" } harmony = { path = "../../harmony" }
harmony_cli = { version = "0.1.0", path = "../../harmony_cli" } harmony_cli = { path = "../../harmony_cli" }
harmony_types = { path = "../../harmony_types" }
logging = "0.1.0" logging = "0.1.0"
tokio.workspace = true tokio.workspace = true
url.workspace = true url.workspace = true

View File

@ -1,15 +1,16 @@
use std::{path::PathBuf, str::FromStr, sync::Arc}; use std::{path::PathBuf, str::FromStr, sync::Arc};
use harmony::{ use harmony::{
data::Id,
inventory::Inventory, inventory::Inventory,
modules::{ modules::{
application::{ApplicationScore, RustWebFramework, RustWebapp, features::Monitoring}, application::{ApplicationScore, RustWebFramework, RustWebapp, features::Monitoring},
monitoring::alert_channel::webhook_receiver::WebhookReceiver, monitoring::alert_channel::webhook_receiver::WebhookReceiver,
tenant::TenantScore, tenant::TenantScore,
}, },
topology::{K8sAnywhereTopology, Url, tenant::TenantConfig}, topology::{K8sAnywhereTopology, tenant::TenantConfig},
}; };
use harmony_types::id::Id;
use harmony_types::net::Url;
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {

View File

@ -2,8 +2,9 @@ use harmony::{
data::Version, data::Version,
inventory::Inventory, inventory::Inventory,
modules::lamp::{LAMPConfig, LAMPScore}, modules::lamp::{LAMPConfig, LAMPScore},
topology::{K8sAnywhereTopology, Url}, topology::K8sAnywhereTopology,
}; };
use harmony_types::net::Url;
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {

View File

@ -6,8 +6,9 @@ readme.workspace = true
license.workspace = true license.workspace = true
[dependencies] [dependencies]
harmony = { version = "0.1.0", path = "../../harmony" } harmony = { path = "../../harmony" }
harmony_cli = { version = "0.1.0", path = "../../harmony_cli" } harmony_cli = { path = "../../harmony_cli" }
harmony_macros = { version = "0.1.0", path = "../../harmony_macros" } harmony_macros = { path = "../../harmony_macros" }
harmony_types = { path = "../../harmony_types" }
tokio.workspace = true tokio.workspace = true
url.workspace = true url.workspace = true

View File

@ -22,8 +22,9 @@ use harmony::{
k8s::pvc::high_pvc_fill_rate_over_two_days, k8s::pvc::high_pvc_fill_rate_over_two_days,
}, },
}, },
topology::{K8sAnywhereTopology, Url}, topology::K8sAnywhereTopology,
}; };
use harmony_types::net::Url;
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {

View File

@ -7,7 +7,8 @@ license.workspace = true
[dependencies] [dependencies]
cidr.workspace = true cidr.workspace = true
harmony = { version = "0.1.0", path = "../../harmony" } harmony = { path = "../../harmony" }
harmony_cli = { version = "0.1.0", path = "../../harmony_cli" } harmony_cli = { path = "../../harmony_cli" }
harmony_types = { path = "../../harmony_types" }
tokio.workspace = true tokio.workspace = true
url.workspace = true url.workspace = true

View File

@ -1,7 +1,6 @@
use std::{collections::HashMap, str::FromStr}; use std::{collections::HashMap, str::FromStr};
use harmony::{ use harmony::{
data::Id,
inventory::Inventory, inventory::Inventory,
modules::{ modules::{
monitoring::{ monitoring::{
@ -19,10 +18,12 @@ use harmony::{
tenant::TenantScore, tenant::TenantScore,
}, },
topology::{ topology::{
K8sAnywhereTopology, Url, K8sAnywhereTopology,
tenant::{ResourceLimits, TenantConfig, TenantNetworkPolicy}, tenant::{ResourceLimits, TenantConfig, TenantNetworkPolicy},
}, },
}; };
use harmony_types::id::Id;
use harmony_types::net::Url;
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {

View File

@ -18,9 +18,10 @@ use harmony::{
}, },
tftp::TftpScore, tftp::TftpScore,
}, },
topology::{LogicalHost, UnmanagedRouter, Url}, topology::{LogicalHost, UnmanagedRouter},
}; };
use harmony_macros::{ip, mac_address}; use harmony_macros::{ip, mac_address};
use harmony_types::net::Url;
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {
@ -86,8 +87,7 @@ async fn main() {
let inventory = Inventory { let inventory = Inventory {
location: Location::new("I am mobile".to_string(), "earth".to_string()), location: Location::new("I am mobile".to_string(), "earth".to_string()),
switch: SwitchGroup::from([]), switch: SwitchGroup::from([]),
firewall: FirewallGroup::from([PhysicalHost::empty(HostCategory::Firewall) firewall_mgmt: Box::new(OPNSenseManagementInterface::new()),
.management(Arc::new(OPNSenseManagementInterface::new()))]),
storage_host: vec![], storage_host: vec![],
worker_host: vec![ worker_host: vec![
PhysicalHost::empty(HostCategory::Server) PhysicalHost::empty(HostCategory::Server)

View File

@ -69,8 +69,7 @@ pub fn get_inventory() -> Inventory {
"testopnsense".to_string(), "testopnsense".to_string(),
), ),
switch: SwitchGroup::from([]), switch: SwitchGroup::from([]),
firewall: FirewallGroup::from([PhysicalHost::empty(HostCategory::Firewall) firewall_mgmt: Box::new(OPNSenseManagementInterface::new()),
.management(Arc::new(OPNSenseManagementInterface::new()))]),
storage_host: vec![], storage_host: vec![],
worker_host: vec![], worker_host: vec![],
control_plane_host: vec![], control_plane_host: vec![],

View File

@ -15,9 +15,10 @@ use harmony::{
opnsense::OPNsenseShellCommandScore, opnsense::OPNsenseShellCommandScore,
tftp::TftpScore, tftp::TftpScore,
}, },
topology::{LogicalHost, UnmanagedRouter, Url}, topology::{LogicalHost, UnmanagedRouter},
}; };
use harmony_macros::{ip, mac_address}; use harmony_macros::{ip, mac_address};
use harmony_types::net::Url;
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {
@ -62,8 +63,7 @@ async fn main() {
"wk".to_string(), "wk".to_string(),
), ),
switch: SwitchGroup::from([]), switch: SwitchGroup::from([]),
firewall: FirewallGroup::from([PhysicalHost::empty(HostCategory::Firewall) firewall_mgmt: Box::new(OPNSenseManagementInterface::new()),
.management(Arc::new(OPNSenseManagementInterface::new()))]),
storage_host: vec![], storage_host: vec![],
worker_host: vec![], worker_host: vec![],
control_plane_host: vec![ control_plane_host: vec![

View File

@ -11,8 +11,9 @@ use harmony::{
discord_alert_channel::DiscordWebhook, webhook_receiver::WebhookReceiver, discord_alert_channel::DiscordWebhook, webhook_receiver::WebhookReceiver,
}, },
}, },
topology::{K8sAnywhereTopology, Url}, topology::K8sAnywhereTopology,
}; };
use harmony_types::net::Url;
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {

View File

@ -1,11 +1,11 @@
use std::str::FromStr; use std::str::FromStr;
use harmony::{ use harmony::{
data::Id,
inventory::Inventory, inventory::Inventory,
modules::tenant::TenantScore, modules::tenant::TenantScore,
topology::{K8sAnywhereTopology, tenant::TenantConfig}, topology::{K8sAnywhereTopology, tenant::TenantConfig},
}; };
use harmony_types::id::Id;
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {

View File

@ -9,7 +9,6 @@ license.workspace = true
testing = [] testing = []
[dependencies] [dependencies]
rand = "0.9"
hex = "0.4" hex = "0.4"
reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"], default-features = false } reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"], default-features = false }
russh = "0.45.0" russh = "0.45.0"
@ -65,10 +64,12 @@ kube-derive = "1.1.0"
bollard.workspace = true bollard.workspace = true
tar.workspace = true tar.workspace = true
base64.workspace = true base64.workspace = true
thiserror.workspace = true
once_cell = "1.21.3" once_cell = "1.21.3"
harmony_inventory_agent = { path = "../harmony_inventory_agent" } harmony_inventory_agent = { path = "../harmony_inventory_agent" }
harmony_secret_derive = { version = "0.1.0", path = "../harmony_secret_derive" } harmony_secret_derive = { version = "0.1.0", path = "../harmony_secret_derive" }
askama = "0.14.0" askama.workspace = true
sqlx.workspace = true
[dev-dependencies] [dev-dependencies]
pretty_assertions.workspace = true pretty_assertions.workspace = true

View File

@ -12,4 +12,12 @@ lazy_static! {
std::env::var("HARMONY_REGISTRY_PROJECT").unwrap_or_else(|_| "harmony".to_string()); std::env::var("HARMONY_REGISTRY_PROJECT").unwrap_or_else(|_| "harmony".to_string());
pub static ref DRY_RUN: bool = pub static ref DRY_RUN: bool =
std::env::var("HARMONY_DRY_RUN").is_ok_and(|value| value.parse().unwrap_or(false)); std::env::var("HARMONY_DRY_RUN").is_ok_and(|value| value.parse().unwrap_or(false));
pub static ref DEFAULT_DATABASE_URL: String = "sqlite://harmony.sqlite".to_string();
pub static ref DATABASE_URL: String = std::env::var("HARMONY_DATABASE_URL")
.map(|value| if value.is_empty() {
(*DEFAULT_DATABASE_URL).clone()
} else {
value
})
.unwrap_or((*DEFAULT_DATABASE_URL).clone());
} }

View File

@ -24,6 +24,14 @@ pub struct Id {
value: String, value: String,
} }
impl Id {
pub fn empty() -> Self {
Id {
value: String::new(),
}
}
}
impl FromStr for Id { impl FromStr for Id {
type Err = (); type Err = ();
@ -34,6 +42,12 @@ impl FromStr for Id {
} }
} }
impl From<String> for Id {
fn from(value: String) -> Self {
Self { value }
}
}
impl std::fmt::Display for Id { impl std::fmt::Display for Id {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.write_str(&self.value) f.write_str(&self.value)

View File

@ -1,6 +1,4 @@
mod file; mod file;
mod id;
mod version; mod version;
pub use file::*; pub use file::*;
pub use id::*;
pub use version::*; pub use version::*;

View File

@ -1,8 +1,7 @@
use std::fmt; use std::fmt;
use async_trait::async_trait; use async_trait::async_trait;
use harmony_types::net::IpAddress;
use super::topology::IpAddress;
#[derive(Debug)] #[derive(Debug)]
pub enum ExecutorError { pub enum ExecutorError {

View File

@ -1,38 +1,156 @@
use std::sync::Arc; use std::sync::Arc;
use derive_new::new; use derive_new::new;
use harmony_inventory_agent::hwinfo::{CPU, MemoryModule, NetworkInterface, StorageDrive};
use harmony_types::net::MacAddress; use harmony_types::net::MacAddress;
use serde::{Serialize, Serializer, ser::SerializeStruct}; use serde::{Deserialize, Serialize};
use serde_value::Value; use serde_value::Value;
pub type HostGroup = Vec<PhysicalHost>; pub type HostGroup = Vec<PhysicalHost>;
pub type SwitchGroup = Vec<Switch>; pub type SwitchGroup = Vec<Switch>;
pub type FirewallGroup = Vec<PhysicalHost>; pub type FirewallGroup = Vec<PhysicalHost>;
#[derive(Debug, Clone)] #[derive(Debug, Clone, Serialize)]
pub struct PhysicalHost { pub struct PhysicalHost {
pub id: Id,
pub category: HostCategory, pub category: HostCategory,
pub network: Vec<NetworkInterface>, pub network: Vec<NetworkInterface>,
pub management: Arc<dyn ManagementInterface>, pub storage: Vec<StorageDrive>,
pub storage: Vec<Storage>,
pub labels: Vec<Label>, pub labels: Vec<Label>,
pub memory_size: Option<u64>, pub memory_modules: Vec<MemoryModule>,
pub cpu_count: Option<u64>, pub cpus: Vec<CPU>,
} }
impl PhysicalHost { impl PhysicalHost {
pub fn empty(category: HostCategory) -> Self { pub fn empty(category: HostCategory) -> Self {
Self { Self {
id: Id::empty(),
category, category,
network: vec![], network: vec![],
storage: vec![], storage: vec![],
labels: vec![], labels: vec![],
management: Arc::new(ManualManagementInterface {}), memory_modules: vec![],
memory_size: None, cpus: vec![],
cpu_count: None,
} }
} }
pub fn summary(&self) -> String {
let mut parts = Vec::new();
// Part 1: System Model (from labels) or Category as a fallback
let model = self
.labels
.iter()
.find(|l| l.name == "system-product-name" || l.name == "model")
.map(|l| l.value.clone())
.unwrap_or_else(|| self.category.to_string());
parts.push(model);
// Part 2: CPU Information
if !self.cpus.is_empty() {
let cpu_count = self.cpus.len();
let total_cores = self.cpus.iter().map(|c| c.cores).sum::<u32>();
let total_threads = self.cpus.iter().map(|c| c.threads).sum::<u32>();
let model_name = &self.cpus[0].model;
let cpu_summary = if cpu_count > 1 {
format!(
"{}x {} ({}c/{}t)",
cpu_count, model_name, total_cores, total_threads
)
} else {
format!("{} ({}c/{}t)", model_name, total_cores, total_threads)
};
parts.push(cpu_summary);
}
// Part 3: Memory Information
if !self.memory_modules.is_empty() {
let total_mem_bytes = self
.memory_modules
.iter()
.map(|m| m.size_bytes)
.sum::<u64>();
let total_mem_gb = (total_mem_bytes as f64 / (1024.0 * 1024.0 * 1024.0)).round() as u64;
// Find the most common speed among modules
let mut speeds = std::collections::HashMap::new();
for module in &self.memory_modules {
if let Some(speed) = module.speed_mhz {
*speeds.entry(speed).or_insert(0) += 1;
}
}
let common_speed = speeds
.into_iter()
.max_by_key(|&(_, count)| count)
.map(|(speed, _)| speed);
if let Some(speed) = common_speed {
parts.push(format!("{} GB RAM @ {}MHz", total_mem_gb, speed));
} else {
parts.push(format!("{} GB RAM", total_mem_gb));
}
}
// Part 4: Storage Information
if !self.storage.is_empty() {
let total_storage_bytes = self.storage.iter().map(|d| d.size_bytes).sum::<u64>();
let drive_count = self.storage.len();
let first_drive_model = &self.storage[0].model;
// Helper to format bytes into TB or GB
let format_storage = |bytes: u64| {
let tb = bytes as f64 / (1024.0 * 1024.0 * 1024.0 * 1024.0);
if tb >= 1.0 {
format!("{:.2} TB", tb)
} else {
let gb = bytes as f64 / (1024.0 * 1024.0 * 1024.0);
format!("{:.0} GB", gb)
}
};
let storage_summary = if drive_count > 1 {
format!(
"{} Storage ({}x {})",
format_storage(total_storage_bytes),
drive_count,
first_drive_model
)
} else {
format!(
"{} Storage ({})",
format_storage(total_storage_bytes),
first_drive_model
)
};
parts.push(storage_summary);
}
// Part 5: Network Information
// Prioritize an "up" interface with an IPv4 address
let best_nic = self
.network
.iter()
.find(|n| n.is_up && !n.ipv4_addresses.is_empty())
.or_else(|| self.network.first());
if let Some(nic) = best_nic {
let speed = nic
.speed_mbps
.map(|s| format!("{}Gbps", s / 1000))
.unwrap_or_else(|| "N/A".to_string());
let mac = nic.mac_address.to_string();
let nic_summary = if let Some(ip) = nic.ipv4_addresses.first() {
format!("NIC: {} ({}, {})", speed, ip, mac)
} else {
format!("NIC: {} ({})", speed, mac)
};
parts.push(nic_summary);
}
parts.join(" | ")
}
pub fn cluster_mac(&self) -> MacAddress { pub fn cluster_mac(&self) -> MacAddress {
self.network self.network
.first() .first()
@ -40,37 +158,17 @@ impl PhysicalHost {
.mac_address .mac_address
} }
pub fn cpu(mut self, cpu_count: Option<u64>) -> Self {
self.cpu_count = cpu_count;
self
}
pub fn memory_size(mut self, memory_size: Option<u64>) -> Self {
self.memory_size = memory_size;
self
}
pub fn storage(
mut self,
connection: StorageConnectionType,
kind: StorageKind,
size: u64,
serial: String,
) -> Self {
self.storage.push(Storage {
connection,
kind,
size,
serial,
});
self
}
pub fn mac_address(mut self, mac_address: MacAddress) -> Self { pub fn mac_address(mut self, mac_address: MacAddress) -> Self {
self.network.push(NetworkInterface { self.network.push(NetworkInterface {
name: None, name: String::new(),
mac_address, mac_address,
speed: None, speed_mbps: None,
is_up: false,
mtu: 0,
ipv4_addresses: vec![],
ipv6_addresses: vec![],
driver: String::new(),
firmware_version: None,
}); });
self self
} }
@ -79,52 +177,56 @@ impl PhysicalHost {
self.labels.push(Label { name, value }); self.labels.push(Label { name, value });
self self
} }
pub fn management(mut self, management: Arc<dyn ManagementInterface>) -> Self {
self.management = management;
self
}
} }
// Custom Serialize implementation for PhysicalHost // Custom Serialize implementation for PhysicalHost
impl Serialize for PhysicalHost { // impl Serialize for PhysicalHost {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> // fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
// where
// S: Serializer,
// {
// // Determine the number of fields
// let mut num_fields = 5; // category, network, storage, labels, management
// if self.memory_modules.is_some() {
// num_fields += 1;
// }
// if self.cpus.is_some() {
// num_fields += 1;
// }
//
// // Create a serialization structure
// let mut state = serializer.serialize_struct("PhysicalHost", num_fields)?;
//
// // Serialize the standard fields
// state.serialize_field("category", &self.category)?;
// state.serialize_field("network", &self.network)?;
// state.serialize_field("storage", &self.storage)?;
// state.serialize_field("labels", &self.labels)?;
//
// // Serialize optional fields
// if let Some(memory) = self.memory_modules {
// state.serialize_field("memory_size", &memory)?;
// }
// if let Some(cpu) = self.cpus {
// state.serialize_field("cpu_count", &cpu)?;
// }
//
// let mgmt_data = self.management.serialize_management();
// // pub management: Arc<dyn ManagementInterface>,
//
// // Handle management interface - either as a field or flattened
// state.serialize_field("management", &mgmt_data)?;
//
// state.end()
// }
// }
impl<'de> Deserialize<'de> for PhysicalHost {
fn deserialize<D>(_deserializer: D) -> Result<Self, D::Error>
where where
S: Serializer, D: serde::Deserializer<'de>,
{ {
// Determine the number of fields todo!()
let mut num_fields = 5; // category, network, storage, labels, management
if self.memory_size.is_some() {
num_fields += 1;
}
if self.cpu_count.is_some() {
num_fields += 1;
}
// Create a serialization structure
let mut state = serializer.serialize_struct("PhysicalHost", num_fields)?;
// Serialize the standard fields
state.serialize_field("category", &self.category)?;
state.serialize_field("network", &self.network)?;
state.serialize_field("storage", &self.storage)?;
state.serialize_field("labels", &self.labels)?;
// Serialize optional fields
if let Some(memory) = self.memory_size {
state.serialize_field("memory_size", &memory)?;
}
if let Some(cpu) = self.cpu_count {
state.serialize_field("cpu_count", &cpu)?;
}
let mgmt_data = self.management.serialize_management();
// pub management: Arc<dyn ManagementInterface>,
// Handle management interface - either as a field or flattened
state.serialize_field("management", &mgmt_data)?;
state.end()
} }
} }
@ -178,59 +280,10 @@ pub enum HostCategory {
Switch, Switch,
} }
#[derive(Debug, new, Clone, Serialize)]
pub struct NetworkInterface {
pub name: Option<String>,
pub mac_address: MacAddress,
pub speed: Option<u64>,
}
#[cfg(test)] #[cfg(test)]
use harmony_macros::mac_address; use harmony_macros::mac_address;
#[cfg(test)]
impl NetworkInterface {
pub fn dummy() -> Self {
Self {
name: Some(String::new()),
mac_address: mac_address!("00:00:00:00:00:00"),
speed: Some(0),
}
}
}
#[derive(Debug, new, Clone, Serialize)] use harmony_types::id::Id;
pub enum StorageConnectionType {
Sata3g,
Sata6g,
Sas6g,
Sas12g,
PCIE,
}
#[derive(Debug, Clone, Serialize)]
pub enum StorageKind {
SSD,
NVME,
HDD,
}
#[derive(Debug, new, Clone, Serialize)]
pub struct Storage {
pub connection: StorageConnectionType,
pub kind: StorageKind,
pub size: u64,
pub serial: String,
}
#[cfg(test)]
impl Storage {
pub fn dummy() -> Self {
Self {
connection: StorageConnectionType::Sata3g,
kind: StorageKind::SSD,
size: 0,
serial: String::new(),
}
}
}
#[derive(Debug, Clone, Serialize)] #[derive(Debug, Clone, Serialize)]
pub struct Switch { pub struct Switch {
@ -261,146 +314,65 @@ impl Location {
} }
} }
impl std::fmt::Display for HostCategory {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
HostCategory::Server => write!(f, "Server"),
HostCategory::Firewall => write!(f, "Firewall"),
HostCategory::Switch => write!(f, "Switch"),
}
}
}
impl std::fmt::Display for Label {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}: {}", self.name, self.value)
}
}
impl std::fmt::Display for Location {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "Address: {}, Name: {}", self.address, self.name)
}
}
impl std::fmt::Display for PhysicalHost {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", self.summary())
}
}
impl std::fmt::Display for Switch {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "Switch with {} interfaces", self._interface.len())
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use serde::{Deserialize, Serialize};
use std::sync::Arc;
// Mock implementation of ManagementInterface
#[derive(Debug, Clone, Serialize, Deserialize)]
struct MockHPIlo {
ip: String,
username: String,
password: String,
firmware_version: String,
}
impl ManagementInterface for MockHPIlo {
fn boot_to_pxe(&self) {}
fn get_supported_protocol_names(&self) -> String {
String::new()
}
}
// Another mock implementation
#[derive(Debug, Clone, Serialize, Deserialize)]
struct MockDellIdrac {
hostname: String,
port: u16,
api_token: String,
}
impl ManagementInterface for MockDellIdrac {
fn boot_to_pxe(&self) {}
fn get_supported_protocol_names(&self) -> String {
String::new()
}
}
#[test]
fn test_serialize_physical_host_with_hp_ilo() {
// Create a PhysicalHost with HP iLO management
let host = PhysicalHost {
category: HostCategory::Server,
network: vec![NetworkInterface::dummy()],
management: Arc::new(MockHPIlo {
ip: "192.168.1.100".to_string(),
username: "admin".to_string(),
password: "password123".to_string(),
firmware_version: "2.5.0".to_string(),
}),
storage: vec![Storage::dummy()],
labels: vec![Label::new("datacenter".to_string(), "us-east".to_string())],
memory_size: Some(64_000_000),
cpu_count: Some(16),
};
// Serialize to JSON
let json = serde_json::to_string(&host).expect("Failed to serialize host");
// Check that the serialized JSON contains the HP iLO details
assert!(json.contains("192.168.1.100"));
assert!(json.contains("admin"));
assert!(json.contains("password123"));
assert!(json.contains("firmware_version"));
assert!(json.contains("2.5.0"));
// Parse back to verify structure (not the exact management interface)
let parsed: serde_json::Value = serde_json::from_str(&json).expect("Failed to parse JSON");
// Verify basic structure
assert_eq!(parsed["cpu_count"], 16);
assert_eq!(parsed["memory_size"], 64_000_000);
assert_eq!(parsed["network"][0]["name"], "");
}
#[test]
fn test_serialize_physical_host_with_dell_idrac() {
// Create a PhysicalHost with Dell iDRAC management
let host = PhysicalHost {
category: HostCategory::Server,
network: vec![NetworkInterface::dummy()],
management: Arc::new(MockDellIdrac {
hostname: "idrac-server01".to_string(),
port: 443,
api_token: "abcdef123456".to_string(),
}),
storage: vec![Storage::dummy()],
labels: vec![Label::new("env".to_string(), "production".to_string())],
memory_size: Some(128_000_000),
cpu_count: Some(32),
};
// Serialize to JSON
let json = serde_json::to_string(&host).expect("Failed to serialize host");
// Check that the serialized JSON contains the Dell iDRAC details
assert!(json.contains("idrac-server01"));
assert!(json.contains("443"));
assert!(json.contains("abcdef123456"));
// Parse back to verify structure
let parsed: serde_json::Value = serde_json::from_str(&json).expect("Failed to parse JSON");
// Verify basic structure
assert_eq!(parsed["cpu_count"], 32);
assert_eq!(parsed["memory_size"], 128_000_000);
assert_eq!(parsed["storage"][0]["path"], serde_json::Value::Null);
}
#[test] #[test]
fn test_different_management_implementations_produce_valid_json() { fn test_different_management_implementations_produce_valid_json() {
// Create hosts with different management implementations // Create hosts with different management implementations
let host1 = PhysicalHost { let host1 = PhysicalHost {
id: Id::empty(),
category: HostCategory::Server, category: HostCategory::Server,
network: vec![], network: vec![],
management: Arc::new(MockHPIlo {
ip: "10.0.0.1".to_string(),
username: "root".to_string(),
password: "secret".to_string(),
firmware_version: "3.0.0".to_string(),
}),
storage: vec![], storage: vec![],
labels: vec![], labels: vec![],
memory_size: None, memory_modules: vec![],
cpu_count: None, cpus: vec![],
}; };
let host2 = PhysicalHost { let host2 = PhysicalHost {
id: Id::empty(),
category: HostCategory::Server, category: HostCategory::Server,
network: vec![], network: vec![],
management: Arc::new(MockDellIdrac {
hostname: "server02-idrac".to_string(),
port: 8443,
api_token: "token123".to_string(),
}),
storage: vec![], storage: vec![],
labels: vec![], labels: vec![],
memory_size: None, memory_modules: vec![],
cpu_count: None, cpus: vec![],
}; };
// Both should serialize successfully // Both should serialize successfully
@ -410,8 +382,5 @@ mod tests {
// Both JSONs should be valid and parseable // Both JSONs should be valid and parseable
let _: serde_json::Value = serde_json::from_str(&json1).expect("Invalid JSON for host1"); let _: serde_json::Value = serde_json::from_str(&json1).expect("Invalid JSON for host1");
let _: serde_json::Value = serde_json::from_str(&json2).expect("Invalid JSON for host2"); let _: serde_json::Value = serde_json::from_str(&json2).expect("Invalid JSON for host2");
// The JSONs should be different because they contain different management interfaces
assert_ne!(json1, json2);
} }
} }

View File

@ -1,13 +1,11 @@
use harmony_types::id::Id;
use std::error::Error; use std::error::Error;
use async_trait::async_trait; use async_trait::async_trait;
use derive_new::new; use derive_new::new;
use super::{ use super::{
data::{Id, Version}, data::Version, executors::ExecutorError, inventory::Inventory, topology::PreparationError,
executors::ExecutorError,
inventory::Inventory,
topology::PreparationError,
}; };
pub enum InterpretName { pub enum InterpretName {

View File

@ -1,3 +1,6 @@
mod repository;
pub use repository::*;
#[derive(Debug, new, Clone)] #[derive(Debug, new, Clone)]
pub struct InventoryFilter { pub struct InventoryFilter {
target: Vec<Filter>, target: Vec<Filter>,
@ -15,6 +18,8 @@ impl InventoryFilter {
use derive_new::new; use derive_new::new;
use log::info; use log::info;
use crate::hardware::{ManagementInterface, ManualManagementInterface};
use super::{ use super::{
filter::Filter, filter::Filter,
hardware::{FirewallGroup, HostGroup, Location, SwitchGroup}, hardware::{FirewallGroup, HostGroup, Location, SwitchGroup},
@ -27,7 +32,7 @@ pub struct Inventory {
// Firewall is really just a host but with somewhat specialized hardware // Firewall is really just a host but with somewhat specialized hardware
// I'm not entirely sure it belongs to its own category but it helps make things easier and // I'm not entirely sure it belongs to its own category but it helps make things easier and
// clearer for now so let's try it this way. // clearer for now so let's try it this way.
pub firewall: FirewallGroup, pub firewall_mgmt: Box<dyn ManagementInterface>,
pub worker_host: HostGroup, pub worker_host: HostGroup,
pub storage_host: HostGroup, pub storage_host: HostGroup,
pub control_plane_host: HostGroup, pub control_plane_host: HostGroup,
@ -38,7 +43,7 @@ impl Inventory {
Self { Self {
location: Location::new("Empty".to_string(), "location".to_string()), location: Location::new("Empty".to_string(), "location".to_string()),
switch: vec![], switch: vec![],
firewall: vec![], firewall_mgmt: Box::new(ManualManagementInterface {}),
worker_host: vec![], worker_host: vec![],
storage_host: vec![], storage_host: vec![],
control_plane_host: vec![], control_plane_host: vec![],
@ -49,7 +54,7 @@ impl Inventory {
Self { Self {
location: Location::test_building(), location: Location::test_building(),
switch: SwitchGroup::new(), switch: SwitchGroup::new(),
firewall: FirewallGroup::new(), firewall_mgmt: Box::new(ManualManagementInterface {}),
worker_host: HostGroup::new(), worker_host: HostGroup::new(),
storage_host: HostGroup::new(), storage_host: HostGroup::new(),
control_plane_host: HostGroup::new(), control_plane_host: HostGroup::new(),

View File

@ -0,0 +1,25 @@
use async_trait::async_trait;
use crate::hardware::PhysicalHost;
/// Errors that can occur within the repository layer.
#[derive(thiserror::Error, Debug)]
pub enum RepoError {
#[error("Database query failed: {0}")]
QueryFailed(String),
#[error("Data serialization failed: {0}")]
Serialization(String),
#[error("Data deserialization failed: {0}")]
Deserialization(String),
#[error("Could not connect to the database: {0}")]
ConnectionFailed(String),
}
// --- Trait and Implementation ---
/// Defines the contract for inventory persistence.
#[async_trait]
pub trait InventoryRepository: Send + Sync + 'static {
async fn save(&self, host: &PhysicalHost) -> Result<(), RepoError>;
async fn get_latest_by_id(&self, host_id: &str) -> Result<Option<PhysicalHost>, RepoError>;
}

View File

@ -1,3 +1,4 @@
use harmony_types::id::Id;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use async_trait::async_trait; use async_trait::async_trait;
@ -5,7 +6,6 @@ use serde::Serialize;
use serde_value::Value; use serde_value::Value;
use super::{ use super::{
data::Id,
instrumentation::{self, HarmonyEvent}, instrumentation::{self, HarmonyEvent},
interpret::{Interpret, InterpretError, Outcome}, interpret::{Interpret, InterpretError, Outcome},
inventory::Inventory, inventory::Inventory,

View File

@ -1,6 +1,7 @@
use async_trait::async_trait; use async_trait::async_trait;
use harmony_macros::ip; use harmony_macros::ip;
use harmony_types::net::MacAddress; use harmony_types::net::MacAddress;
use harmony_types::net::Url;
use log::debug; use log::debug;
use log::info; use log::info;
@ -26,7 +27,6 @@ use super::Router;
use super::TftpServer; use super::TftpServer;
use super::Topology; use super::Topology;
use super::Url;
use super::k8s::K8sClient; use super::k8s::K8sClient;
use std::sync::Arc; use std::sync::Arc;

View File

@ -1,8 +1,8 @@
use crate::{data::FileContent, executors::ExecutorError}; use crate::{data::FileContent, executors::ExecutorError};
use async_trait::async_trait; use async_trait::async_trait;
use super::{IpAddress, Url}; use harmony_types::net::IpAddress;
use harmony_types::net::Url;
#[async_trait] #[async_trait]
pub trait HttpServer: Send + Sync { pub trait HttpServer: Send + Sync {
async fn serve_files(&self, url: &Url) -> Result<(), ExecutorError>; async fn serve_files(&self, url: &Url) -> Result<(), ExecutorError>;

View File

@ -4,8 +4,9 @@ use async_trait::async_trait;
use log::debug; use log::debug;
use serde::Serialize; use serde::Serialize;
use super::{IpAddress, LogicalHost}; use super::LogicalHost;
use crate::executors::ExecutorError; use crate::executors::ExecutorError;
use harmony_types::net::IpAddress;
impl std::fmt::Debug for dyn LoadBalancer { impl std::fmt::Debug for dyn LoadBalancer {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {

View File

@ -1,4 +1,5 @@
mod ha_cluster; mod ha_cluster;
use harmony_types::net::IpAddress;
mod host_binding; mod host_binding;
mod http; mod http;
pub mod installable; pub mod installable;
@ -32,7 +33,6 @@ use super::{
instrumentation::{self, HarmonyEvent}, instrumentation::{self, HarmonyEvent},
}; };
use std::error::Error; use std::error::Error;
use std::net::IpAddr;
/// Represents a logical view of an infrastructure environment providing specific capabilities. /// Represents a logical view of an infrastructure environment providing specific capabilities.
/// ///
@ -196,35 +196,6 @@ pub trait MultiTargetTopology: Topology {
fn current_target(&self) -> DeploymentTarget; fn current_target(&self) -> DeploymentTarget;
} }
pub type IpAddress = IpAddr;
#[derive(Debug, Clone)]
pub enum Url {
LocalFolder(String),
Url(url::Url),
}
impl Serialize for Url {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
match self {
Url::LocalFolder(path) => serializer.serialize_str(path),
Url::Url(url) => serializer.serialize_str(url.as_str()),
}
}
}
impl std::fmt::Display for Url {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Url::LocalFolder(path) => write!(f, "{}", path),
Url::Url(url) => write!(f, "{}", url),
}
}
}
/// Represents a logical member of a cluster that provides one or more services. /// Represents a logical member of a cluster that provides one or more services.
/// ///
/// A LogicalHost can represent various roles within the infrastructure, such as: /// A LogicalHost can represent various roles within the infrastructure, such as:
@ -263,7 +234,8 @@ impl LogicalHost {
/// ///
/// ``` /// ```
/// use std::str::FromStr; /// use std::str::FromStr;
/// use harmony::topology::{IpAddress, LogicalHost}; /// use harmony::topology::{LogicalHost};
/// use harmony_types::net::IpAddress;
/// ///
/// let start_ip = IpAddress::from_str("192.168.0.20").unwrap(); /// let start_ip = IpAddress::from_str("192.168.0.20").unwrap();
/// let hosts = LogicalHost::create_hosts(3, start_ip, "worker"); /// let hosts = LogicalHost::create_hosts(3, start_ip, "worker");
@ -319,7 +291,7 @@ fn increment_ip(ip: IpAddress, increment: u32) -> Option<IpAddress> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use harmony_types::net::Url;
use serde_json; use serde_json;
#[test] #[test]

View File

@ -1,12 +1,12 @@
use std::{net::Ipv4Addr, str::FromStr, sync::Arc}; use std::{net::Ipv4Addr, str::FromStr, sync::Arc};
use async_trait::async_trait; use async_trait::async_trait;
use harmony_types::net::MacAddress; use harmony_types::net::{IpAddress, MacAddress};
use serde::Serialize; use serde::Serialize;
use crate::executors::ExecutorError; use crate::executors::ExecutorError;
use super::{IpAddress, LogicalHost, k8s::K8sClient}; use super::{LogicalHost, k8s::K8sClient};
#[derive(Debug)] #[derive(Debug)]
pub struct DHCPStaticEntry { pub struct DHCPStaticEntry {

View File

@ -4,11 +4,12 @@ use async_trait::async_trait;
use log::debug; use log::debug;
use crate::{ use crate::{
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
topology::{Topology, installable::Installable}, topology::{Topology, installable::Installable},
}; };
use harmony_types::id::Id;
#[async_trait] #[async_trait]
pub trait AlertSender: Send + Sync + std::fmt::Debug { pub trait AlertSender: Send + Sync + std::fmt::Debug {

View File

@ -2,7 +2,7 @@ pub mod k8s;
mod manager; mod manager;
pub mod network_policy; pub mod network_policy;
use crate::data::Id; use harmony_types::id::Id;
pub use manager::*; pub use manager::*;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::str::FromStr; use std::str::FromStr;

View File

@ -1,7 +1,7 @@
use crate::executors::ExecutorError; use crate::executors::ExecutorError;
use async_trait::async_trait; use async_trait::async_trait;
use super::{IpAddress, Url}; use harmony_types::net::{IpAddress, Url};
#[async_trait] #[async_trait]
pub trait TftpServer: Send + Sync { pub trait TftpServer: Send + Sync {

View File

@ -3,11 +3,9 @@ use std::sync::Arc;
use russh::{client, keys::key}; use russh::{client, keys::key};
use crate::{ use crate::domain::executors::{ExecutorError, SshClient};
domain::executors::{ExecutorError, SshClient},
topology::IpAddress,
};
use harmony_types::net::IpAddress;
pub struct RusshClient; pub struct RusshClient;
#[async_trait] #[async_trait]

View File

@ -1,6 +1,6 @@
use crate::hardware::ManagementInterface; use crate::hardware::ManagementInterface;
use crate::topology::IpAddress;
use derive_new::new; use derive_new::new;
use harmony_types::net::IpAddress;
use harmony_types::net::MacAddress; use harmony_types::net::MacAddress;
use log::info; use log::info;
use serde::Serialize; use serde::Serialize;

View File

@ -0,0 +1,17 @@
use crate::{
config::DATABASE_URL,
infra::inventory::sqlite::SqliteInventoryRepository,
inventory::{InventoryRepository, RepoError},
};
pub mod sqlite;
pub struct InventoryRepositoryFactory;
impl InventoryRepositoryFactory {
pub async fn build() -> Result<Box<dyn InventoryRepository>, RepoError> {
Ok(Box::new(
SqliteInventoryRepository::new(&(*DATABASE_URL)).await?,
))
}
}

View File

@ -0,0 +1,65 @@
use crate::{
hardware::PhysicalHost,
inventory::{InventoryRepository, RepoError},
};
use async_trait::async_trait;
use harmony_types::id::Id;
use log::info;
use sqlx::{Pool, Sqlite, SqlitePool};
/// A thread-safe, connection-pooled repository using SQLite.
#[derive(Debug)]
pub struct SqliteInventoryRepository {
pool: Pool<Sqlite>,
}
impl SqliteInventoryRepository {
pub async fn new(database_url: &str) -> Result<Self, RepoError> {
let pool = SqlitePool::connect(database_url)
.await
.map_err(|e| RepoError::ConnectionFailed(e.to_string()))?;
info!("SQLite inventory repository initialized at '{database_url}'");
Ok(Self { pool })
}
}
#[async_trait]
impl InventoryRepository for SqliteInventoryRepository {
async fn save(&self, host: &PhysicalHost) -> Result<(), RepoError> {
let data = serde_json::to_vec(host).map_err(|e| RepoError::Serialization(e.to_string()))?;
let id = Id::default().to_string();
let host_id = host.id.to_string();
sqlx::query!(
"INSERT INTO physical_hosts (id, version_id, data) VALUES (?, ?, ?)",
host_id,
id,
data,
)
.execute(&self.pool)
.await?;
info!("Saved new inventory version for host '{}'", host.id);
Ok(())
}
async fn get_latest_by_id(&self, host_id: &str) -> Result<Option<PhysicalHost>, RepoError> {
let _row = sqlx::query_as!(
DbHost,
r#"SELECT id, version_id, data as "data: Json<PhysicalHost>" FROM physical_hosts WHERE id = ? ORDER BY version_id DESC LIMIT 1"#,
host_id
)
.fetch_optional(&self.pool)
.await?;
todo!()
}
}
use sqlx::types::Json;
struct DbHost {
data: Json<PhysicalHost>,
id: Id,
version_id: Id,
}

View File

@ -1,4 +1,6 @@
pub mod executors; pub mod executors;
pub mod hp_ilo; pub mod hp_ilo;
pub mod intel_amt; pub mod intel_amt;
pub mod inventory;
pub mod opnsense; pub mod opnsense;
mod sqlx;

View File

@ -4,10 +4,11 @@ use log::info;
use crate::{ use crate::{
executors::ExecutorError, executors::ExecutorError,
topology::{DHCPStaticEntry, DhcpServer, IpAddress, LogicalHost, PxeOptions}, topology::{DHCPStaticEntry, DhcpServer, LogicalHost, PxeOptions},
}; };
use super::OPNSenseFirewall; use super::OPNSenseFirewall;
use harmony_types::net::IpAddress;
#[async_trait] #[async_trait]
impl DhcpServer for OPNSenseFirewall { impl DhcpServer for OPNSenseFirewall {

View File

@ -1,11 +1,11 @@
use crate::infra::opnsense::Host; use crate::infra::opnsense::Host;
use crate::infra::opnsense::IpAddress;
use crate::infra::opnsense::LogicalHost; use crate::infra::opnsense::LogicalHost;
use crate::{ use crate::{
executors::ExecutorError, executors::ExecutorError,
topology::{DnsRecord, DnsServer}, topology::{DnsRecord, DnsServer},
}; };
use async_trait::async_trait; use async_trait::async_trait;
use harmony_types::net::IpAddress;
use super::OPNSenseFirewall; use super::OPNSenseFirewall;

View File

@ -1,9 +1,10 @@
use crate::{ use crate::{
executors::ExecutorError, executors::ExecutorError,
topology::{Firewall, FirewallRule, IpAddress, LogicalHost}, topology::{Firewall, FirewallRule, LogicalHost},
}; };
use super::OPNSenseFirewall; use super::OPNSenseFirewall;
use harmony_types::net::IpAddress;
impl Firewall for OPNSenseFirewall { impl Firewall for OPNSenseFirewall {
fn add_rule(&mut self, _rule: FirewallRule) -> Result<(), ExecutorError> { fn add_rule(&mut self, _rule: FirewallRule) -> Result<(), ExecutorError> {

View File

@ -1,13 +1,11 @@
use async_trait::async_trait; use async_trait::async_trait;
use log::info; use log::info;
use crate::{ use crate::{data::FileContent, executors::ExecutorError, topology::HttpServer};
data::FileContent,
executors::ExecutorError,
topology::{HttpServer, IpAddress, Url},
};
use super::OPNSenseFirewall; use super::OPNSenseFirewall;
use harmony_types::net::IpAddress;
use harmony_types::net::Url;
const OPNSENSE_HTTP_ROOT_PATH: &str = "/usr/local/http"; const OPNSENSE_HTTP_ROOT_PATH: &str = "/usr/local/http";
#[async_trait] #[async_trait]

View File

@ -6,10 +6,11 @@ use uuid::Uuid;
use crate::{ use crate::{
executors::ExecutorError, executors::ExecutorError,
topology::{ topology::{
BackendServer, HealthCheck, HttpMethod, HttpStatusCode, IpAddress, LoadBalancer, BackendServer, HealthCheck, HttpMethod, HttpStatusCode, LoadBalancer, LoadBalancerService,
LoadBalancerService, LogicalHost, LogicalHost,
}, },
}; };
use harmony_types::net::IpAddress;
use super::OPNSenseFirewall; use super::OPNSenseFirewall;

View File

@ -11,10 +11,8 @@ pub use management::*;
use opnsense_config_xml::Host; use opnsense_config_xml::Host;
use tokio::sync::RwLock; use tokio::sync::RwLock;
use crate::{ use crate::{executors::ExecutorError, topology::LogicalHost};
executors::ExecutorError, use harmony_types::net::IpAddress;
topology::{IpAddress, LogicalHost},
};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct OPNSenseFirewall { pub struct OPNSenseFirewall {

View File

@ -1,10 +1,9 @@
use async_trait::async_trait; use async_trait::async_trait;
use log::info; use log::info;
use crate::{ use crate::{executors::ExecutorError, topology::TftpServer};
executors::ExecutorError, use harmony_types::net::IpAddress;
topology::{IpAddress, TftpServer, Url}, use harmony_types::net::Url;
};
use super::OPNSenseFirewall; use super::OPNSenseFirewall;

36
harmony/src/infra/sqlx.rs Normal file
View File

@ -0,0 +1,36 @@
use crate::inventory::RepoError;
impl From<sqlx::Error> for RepoError {
fn from(value: sqlx::Error) -> Self {
match value {
sqlx::Error::Configuration(_)
| sqlx::Error::Io(_)
| sqlx::Error::Tls(_)
| sqlx::Error::Protocol(_)
| sqlx::Error::PoolTimedOut
| sqlx::Error::PoolClosed
| sqlx::Error::WorkerCrashed => RepoError::ConnectionFailed(value.to_string()),
sqlx::Error::InvalidArgument(_)
| sqlx::Error::Database(_)
| sqlx::Error::RowNotFound
| sqlx::Error::TypeNotFound { .. }
| sqlx::Error::ColumnIndexOutOfBounds { .. }
| sqlx::Error::ColumnNotFound(_)
| sqlx::Error::AnyDriverError(_)
| sqlx::Error::Migrate(_)
| sqlx::Error::InvalidSavePointStatement
| sqlx::Error::BeginFailed => RepoError::QueryFailed(value.to_string()),
sqlx::Error::Encode(_) => RepoError::Serialization(value.to_string()),
sqlx::Error::Decode(_) | sqlx::Error::ColumnDecode { .. } => {
RepoError::Deserialization(value.to_string())
}
_ => RepoError::QueryFailed(value.to_string()),
}
}
}
impl From<serde_json::Error> for RepoError {
fn from(value: serde_json::Error) -> Self {
RepoError::Serialization(value.to_string())
}
}

View File

@ -4,13 +4,14 @@ use serde::Serialize;
use std::str::FromStr; use std::str::FromStr;
use crate::{ use crate::{
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
modules::helm::chart::{HelmChartScore, HelmRepository}, modules::helm::chart::{HelmChartScore, HelmRepository},
score::Score, score::Score,
topology::{HelmCommand, K8sclient, Topology}, topology::{HelmCommand, K8sclient, Topology},
}; };
use harmony_types::id::Id;
use super::ArgoApplication; use super::ArgoApplication;

View File

@ -11,7 +11,7 @@ use crate::{
alert_channel::webhook_receiver::WebhookReceiver, ntfy::ntfy::NtfyScore, alert_channel::webhook_receiver::WebhookReceiver, ntfy::ntfy::NtfyScore,
}, },
score::Score, score::Score,
topology::{HelmCommand, K8sclient, Topology, Url, tenant::TenantManager}, topology::{HelmCommand, K8sclient, Topology, tenant::TenantManager},
}; };
use crate::{ use crate::{
modules::prometheus::prometheus::PrometheusApplicationMonitoring, modules::prometheus::prometheus::PrometheusApplicationMonitoring,
@ -19,6 +19,7 @@ use crate::{
}; };
use async_trait::async_trait; use async_trait::async_trait;
use base64::{Engine as _, engine::general_purpose}; use base64::{Engine as _, engine::general_purpose};
use harmony_types::net::Url;
use log::{debug, info}; use log::{debug, info};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]

View File

@ -13,12 +13,13 @@ use async_trait::async_trait;
use serde::Serialize; use serde::Serialize;
use crate::{ use crate::{
data::{Id, Version}, data::Version,
instrumentation::{self, HarmonyEvent}, instrumentation::{self, HarmonyEvent},
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
topology::Topology, topology::Topology,
}; };
use harmony_types::id::Id;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum ApplicationFeatureStatus { pub enum ApplicationFeatureStatus {

View File

@ -15,10 +15,8 @@ use serde::Serialize;
use tar::Archive; use tar::Archive;
use crate::config::{REGISTRY_PROJECT, REGISTRY_URL}; use crate::config::{REGISTRY_PROJECT, REGISTRY_URL};
use crate::{ use crate::{score::Score, topology::Topology};
score::Score, use harmony_types::net::Url;
topology::{Topology, Url},
};
use super::{Application, ApplicationFeature, ApplicationInterpret, HelmPackage, OCICompliant}; use super::{Application, ApplicationFeature, ApplicationInterpret, HelmPackage, OCICompliant};

View File

@ -1,5 +1,6 @@
use async_trait::async_trait; use async_trait::async_trait;
use derive_new::new; use derive_new::new;
use harmony_types::id::Id;
use log::info; use log::info;
use serde::Serialize; use serde::Serialize;
@ -7,10 +8,11 @@ use crate::{
domain::{data::Version, interpret::InterpretStatus}, domain::{data::Version, interpret::InterpretStatus},
interpret::{Interpret, InterpretError, InterpretName, Outcome}, interpret::{Interpret, InterpretError, InterpretName, Outcome},
inventory::Inventory, inventory::Inventory,
topology::{DHCPStaticEntry, DhcpServer, HostBinding, IpAddress, PxeOptions, Topology}, topology::{DHCPStaticEntry, DhcpServer, HostBinding, PxeOptions, Topology},
}; };
use crate::domain::score::Score; use crate::domain::score::Score;
use harmony_types::net::IpAddress;
#[derive(Debug, new, Clone, Serialize)] #[derive(Debug, new, Clone, Serialize)]
pub struct DhcpScore { pub struct DhcpScore {
@ -135,7 +137,7 @@ impl<T: DhcpServer> Interpret<T> for DhcpInterpret {
self.status.clone() self.status.clone()
} }
fn get_children(&self) -> Vec<crate::domain::data::Id> { fn get_children(&self) -> Vec<Id> {
todo!() todo!()
} }

View File

@ -1,5 +1,6 @@
use async_trait::async_trait; use async_trait::async_trait;
use derive_new::new; use derive_new::new;
use harmony_types::id::Id;
use log::info; use log::info;
use serde::Serialize; use serde::Serialize;
@ -91,7 +92,7 @@ impl<T: Topology + DnsServer> Interpret<T> for DnsInterpret {
self.status.clone() self.status.clone()
} }
fn get_children(&self) -> Vec<crate::domain::data::Id> { fn get_children(&self) -> Vec<Id> {
todo!() todo!()
} }

View File

@ -1,4 +1,5 @@
use async_trait::async_trait; use async_trait::async_trait;
use harmony_types::id::Id;
use serde::Serialize; use serde::Serialize;
use crate::{ use crate::{
@ -67,7 +68,7 @@ impl<T: Topology> Interpret<T> for DummyInterpret {
self.status.clone() self.status.clone()
} }
fn get_children(&self) -> Vec<crate::domain::data::Id> { fn get_children(&self) -> Vec<Id> {
todo!() todo!()
} }
@ -113,7 +114,7 @@ impl<T: Topology> Interpret<T> for PanicInterpret {
InterpretStatus::QUEUED InterpretStatus::QUEUED
} }
fn get_children(&self) -> Vec<crate::domain::data::Id> { fn get_children(&self) -> Vec<Id> {
todo!() todo!()
} }

View File

@ -1,9 +1,10 @@
use crate::data::{Id, Version}; use crate::data::Version;
use crate::interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}; use crate::interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome};
use crate::inventory::Inventory; use crate::inventory::Inventory;
use crate::score::Score; use crate::score::Score;
use crate::topology::{HelmCommand, Topology}; use crate::topology::{HelmCommand, Topology};
use async_trait::async_trait; use async_trait::async_trait;
use harmony_types::id::Id;
use helm_wrapper_rs; use helm_wrapper_rs;
use helm_wrapper_rs::blocking::{DefaultHelmExecutor, HelmExecutor}; use helm_wrapper_rs::blocking::{DefaultHelmExecutor, HelmExecutor};
use log::{debug, info, warn}; use log::{debug, info, warn};

View File

@ -8,11 +8,12 @@ use std::process::{Command, Output};
use temp_dir::{self, TempDir}; use temp_dir::{self, TempDir};
use temp_file::TempFile; use temp_file::TempFile;
use crate::data::{Id, Version}; use crate::data::Version;
use crate::interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}; use crate::interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome};
use crate::inventory::Inventory; use crate::inventory::Inventory;
use crate::score::Score; use crate::score::Score;
use crate::topology::{HelmCommand, K8sclient, Topology}; use crate::topology::{HelmCommand, K8sclient, Topology};
use harmony_types::id::Id;
#[derive(Clone)] #[derive(Clone)]
pub struct HelmCommandExecutor { pub struct HelmCommandExecutor {

View File

@ -3,12 +3,14 @@ use derive_new::new;
use serde::Serialize; use serde::Serialize;
use crate::{ use crate::{
data::{FileContent, Id, Version}, data::{FileContent, Version},
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
score::Score, score::Score,
topology::{HttpServer, Topology, Url}, topology::{HttpServer, Topology},
}; };
use harmony_types::id::Id;
use harmony_types::net::Url;
/// Configure an HTTP server that is provided by the Topology /// Configure an HTTP server that is provided by the Topology
/// ///

View File

@ -1,15 +1,18 @@
use async_trait::async_trait; use async_trait::async_trait;
use harmony_inventory_agent::local_presence::DiscoveryEvent; use harmony_inventory_agent::local_presence::DiscoveryEvent;
use log::{debug, info}; use log::{debug, info, trace};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::{ use crate::{
data::{Id, Version}, data::Version,
hardware::{HostCategory, Label, PhysicalHost},
infra::inventory::InventoryRepositoryFactory,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
score::Score, score::Score,
topology::Topology, topology::Topology,
}; };
use harmony_types::id::Id;
/// This launches an harmony_inventory_agent discovery process /// This launches an harmony_inventory_agent discovery process
/// This will allow us to register/update hosts running harmony_inventory_agent /// This will allow us to register/update hosts running harmony_inventory_agent
@ -40,20 +43,89 @@ struct DiscoverInventoryAgentInterpret {
impl<T: Topology> Interpret<T> for DiscoverInventoryAgentInterpret { impl<T: Topology> Interpret<T> for DiscoverInventoryAgentInterpret {
async fn execute( async fn execute(
&self, &self,
inventory: &Inventory, _inventory: &Inventory,
topology: &T, _topology: &T,
) -> Result<Outcome, InterpretError> { ) -> Result<Outcome, InterpretError> {
harmony_inventory_agent::local_presence::discover_agents( harmony_inventory_agent::local_presence::discover_agents(
self.score.discovery_timeout, self.score.discovery_timeout,
|event: DiscoveryEvent| { |event: DiscoveryEvent| -> Result<(), String> {
println!("Discovery event {event:?}"); debug!("Discovery event {event:?}");
match event { match event {
DiscoveryEvent::ServiceResolved(service) => info!("Found instance {service:?}"), DiscoveryEvent::ServiceResolved(service) => {
let service_name = service.fullname.clone();
info!("Found service {service_name}");
let address = match service.get_addresses().iter().next() {
Some(address) => address,
None => {
return Err(format!(
"Could not find address for service {service_name}"
));
}
};
let address = address.to_string();
let port = service.get_port();
tokio::task::spawn(async move {
info!("Getting inventory for host {address} at port {port}");
let host =
harmony_inventory_agent::client::get_host_inventory(&address, port)
.await
.unwrap();
trace!("Found host information {host:?}");
// TODO its useless to have two distinct host types but requires a bit much
// refactoring to do it now
let harmony_inventory_agent::hwinfo::PhysicalHost {
storage_drives,
storage_controller,
memory_modules,
cpus,
chipset,
network_interfaces,
management_interface,
host_uuid,
} = host;
let host = PhysicalHost {
id: Id::from(host_uuid),
category: HostCategory::Server,
network: network_interfaces,
storage: storage_drives,
labels: vec![Label {
name: "discovered-by".to_string(),
value: "harmony-inventory-agent".to_string(),
}],
memory_modules,
cpus,
};
let repo = InventoryRepositoryFactory::build()
.await
.map_err(|e| format!("Could not build repository : {e}"))
.unwrap();
repo.save(&host)
.await
.map_err(|e| format!("Could not save host : {e}"))
.unwrap();
info!(
"Saved new host id {}, summary : {}",
host.id,
host.summary()
);
});
}
_ => debug!("Unhandled event {event:?}"), _ => debug!("Unhandled event {event:?}"),
} };
Ok(())
}, },
); )
todo!() .await;
Ok(Outcome {
status: InterpretStatus::SUCCESS,
message: "Discovery process completed successfully".to_string(),
})
} }
fn get_name(&self) -> InterpretName { fn get_name(&self) -> InterpretName {

View File

@ -3,12 +3,13 @@ use derive_new::new;
use serde::Serialize; use serde::Serialize;
use crate::{ use crate::{
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
score::Score, score::Score,
topology::Topology, topology::Topology,
}; };
use harmony_types::id::Id;
#[derive(Debug, new, Clone, Serialize)] #[derive(Debug, new, Clone, Serialize)]
pub struct IpxeScore { pub struct IpxeScore {

View File

@ -6,12 +6,13 @@ use serde::Serialize;
use crate::{ use crate::{
config::HARMONY_DATA_DIR, config::HARMONY_DATA_DIR,
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
score::Score, score::Score,
topology::Topology, topology::Topology,
}; };
use harmony_types::id::Id;
#[derive(Debug, Clone, Serialize)] #[derive(Debug, Clone, Serialize)]
pub struct K3DInstallationScore { pub struct K3DInstallationScore {

View File

@ -5,12 +5,13 @@ use log::info;
use serde::{Serialize, de::DeserializeOwned}; use serde::{Serialize, de::DeserializeOwned};
use crate::{ use crate::{
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
score::Score, score::Score,
topology::{K8sclient, Topology}, topology::{K8sclient, Topology},
}; };
use harmony_types::id::Id;
#[derive(Debug, Clone, Serialize)] #[derive(Debug, Clone, Serialize)]
pub struct K8sResourceScore<K: Resource + std::fmt::Debug> { pub struct K8sResourceScore<K: Resource + std::fmt::Debug> {

View File

@ -3,6 +3,7 @@ use dockerfile_builder::instruction::{CMD, COPY, ENV, EXPOSE, FROM, RUN, WORKDIR
use dockerfile_builder::{Dockerfile, instruction_builder::EnvBuilder}; use dockerfile_builder::{Dockerfile, instruction_builder::EnvBuilder};
use fqdn::fqdn; use fqdn::fqdn;
use harmony_macros::ingress_path; use harmony_macros::ingress_path;
use harmony_types::net::Url;
use non_blank_string_rs::NonBlankString; use non_blank_string_rs::NonBlankString;
use serde_json::json; use serde_json::json;
use std::collections::HashMap; use std::collections::HashMap;
@ -18,13 +19,14 @@ use crate::config::{REGISTRY_PROJECT, REGISTRY_URL};
use crate::modules::k8s::ingress::K8sIngressScore; use crate::modules::k8s::ingress::K8sIngressScore;
use crate::topology::HelmCommand; use crate::topology::HelmCommand;
use crate::{ use crate::{
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
modules::k8s::deployment::K8sDeploymentScore, modules::k8s::deployment::K8sDeploymentScore,
score::Score, score::Score,
topology::{K8sclient, Topology, Url}, topology::{K8sclient, Topology},
}; };
use harmony_types::id::Id;
use super::helm::chart::HelmChartScore; use super::helm::chart::HelmChartScore;

View File

@ -3,12 +3,13 @@ use log::info;
use serde::Serialize; use serde::Serialize;
use crate::{ use crate::{
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
score::Score, score::Score,
topology::{LoadBalancer, LoadBalancerService, Topology}, topology::{LoadBalancer, LoadBalancerService, Topology},
}; };
use harmony_types::id::Id;
#[derive(Debug, Clone, Serialize)] #[derive(Debug, Clone, Serialize)]
pub struct LoadBalancerScore { pub struct LoadBalancerScore {

View File

@ -20,8 +20,9 @@ use crate::{
}, },
prometheus::prometheus::{Prometheus, PrometheusReceiver}, prometheus::prometheus::{Prometheus, PrometheusReceiver},
}, },
topology::{Url, oberservability::monitoring::AlertReceiver}, topology::oberservability::monitoring::AlertReceiver,
}; };
use harmony_types::net::Url;
#[derive(Debug, Clone, Serialize)] #[derive(Debug, Clone, Serialize)]
pub struct DiscordWebhook { pub struct DiscordWebhook {

View File

@ -19,8 +19,9 @@ use crate::{
}, },
prometheus::prometheus::{Prometheus, PrometheusReceiver}, prometheus::prometheus::{Prometheus, PrometheusReceiver},
}, },
topology::{Url, oberservability::monitoring::AlertReceiver}, topology::oberservability::monitoring::AlertReceiver,
}; };
use harmony_types::net::Url;
#[derive(Debug, Clone, Serialize)] #[derive(Debug, Clone, Serialize)]
pub struct WebhookReceiver { pub struct WebhookReceiver {

View File

@ -4,7 +4,7 @@ use async_trait::async_trait;
use serde::Serialize; use serde::Serialize;
use crate::{ use crate::{
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
modules::{ modules::{
@ -15,6 +15,7 @@ use crate::{
score::Score, score::Score,
topology::{PreparationOutcome, Topology, oberservability::monitoring::AlertReceiver}, topology::{PreparationOutcome, Topology, oberservability::monitoring::AlertReceiver},
}; };
use harmony_types::id::Id;
#[derive(Debug, Clone, Serialize)] #[derive(Debug, Clone, Serialize)]
pub struct ApplicationMonitoringScore { pub struct ApplicationMonitoringScore {

View File

@ -6,13 +6,14 @@ use serde::Serialize;
use strum::{Display, EnumString}; use strum::{Display, EnumString};
use crate::{ use crate::{
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
modules::monitoring::ntfy::helm::ntfy_helm_chart::ntfy_helm_chart_score, modules::monitoring::ntfy::helm::ntfy_helm_chart::ntfy_helm_chart_score,
score::Score, score::Score,
topology::{HelmCommand, K8sclient, MultiTargetTopology, Topology, k8s::K8sClient}, topology::{HelmCommand, K8sclient, MultiTargetTopology, Topology, k8s::K8sClient},
}; };
use harmony_types::id::Id;
#[derive(Debug, Clone, Serialize)] #[derive(Debug, Clone, Serialize)]
pub struct NtfyScore { pub struct NtfyScore {

View File

@ -1,17 +1,19 @@
use askama::Template; use askama::Template;
use async_trait::async_trait; use async_trait::async_trait;
use derive_new::new; use derive_new::new;
use harmony_types::net::Url;
use serde::Serialize; use serde::Serialize;
use std::net::IpAddr; use std::net::IpAddr;
use crate::{ use crate::{
data::{FileContent, FilePath, Id, Version}, data::{FileContent, FilePath, Version},
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
modules::{dhcp::DhcpScore, http::StaticFilesHttpScore, tftp::TftpScore}, modules::{dhcp::DhcpScore, http::StaticFilesHttpScore, tftp::TftpScore},
score::Score, score::Score,
topology::{DhcpServer, HttpServer, Router, TftpServer, Topology, Url}, topology::{DhcpServer, HttpServer, Router, TftpServer, Topology},
}; };
use harmony_types::id::Id;
#[derive(Debug, new, Clone, Serialize)] #[derive(Debug, new, Clone, Serialize)]
pub struct OkdIpxeScore { pub struct OkdIpxeScore {

View File

@ -5,12 +5,13 @@ use serde::Serialize;
use tokio::sync::RwLock; use tokio::sync::RwLock;
use crate::{ use crate::{
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
score::Score, score::Score,
topology::Topology, topology::Topology,
}; };
use harmony_types::id::Id;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct OPNsenseShellCommandScore { pub struct OPNsenseShellCommandScore {

View File

@ -24,7 +24,7 @@ use crate::modules::monitoring::kube_prometheus::crd::service_monitor::{
use crate::topology::oberservability::monitoring::AlertReceiver; use crate::topology::oberservability::monitoring::AlertReceiver;
use crate::topology::{K8sclient, Topology, k8s::K8sClient}; use crate::topology::{K8sclient, Topology, k8s::K8sClient};
use crate::{ use crate::{
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
modules::monitoring::kube_prometheus::crd::{ modules::monitoring::kube_prometheus::crd::{
@ -37,6 +37,7 @@ use crate::{
}, },
score::Score, score::Score,
}; };
use harmony_types::id::Id;
use super::prometheus::PrometheusApplicationMonitoring; use super::prometheus::PrometheusApplicationMonitoring;

View File

@ -9,12 +9,13 @@ use serde::{Deserialize, Serialize};
use tokio::time::sleep; use tokio::time::sleep;
use crate::{ use crate::{
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
score::Score, score::Score,
topology::{K8sclient, Topology, k8s::K8sClient}, topology::{K8sclient, Topology, k8s::K8sClient},
}; };
use harmony_types::id::Id;
#[derive(Debug, Clone, Serialize)] #[derive(Debug, Clone, Serialize)]
pub struct CephRemoveOsd { pub struct CephRemoveOsd {

View File

@ -3,15 +3,15 @@ use std::{sync::Arc, time::Duration};
use async_trait::async_trait; use async_trait::async_trait;
use log::debug; use log::debug;
use serde::Serialize; use serde::Serialize;
use tokio::time::Instant;
use crate::{ use crate::{
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
score::Score, score::Score,
topology::{K8sclient, Topology, k8s::K8sClient}, topology::{K8sclient, Topology, k8s::K8sClient},
}; };
use harmony_types::id::Id;
#[derive(Clone, Debug, Serialize)] #[derive(Clone, Debug, Serialize)]
pub struct CephVerifyClusterHealth { pub struct CephVerifyClusterHealth {

View File

@ -5,7 +5,7 @@ use async_trait::async_trait;
use serde::Serialize; use serde::Serialize;
use crate::{ use crate::{
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
score::Score, score::Score,
@ -14,6 +14,7 @@ use crate::{
tenant::{TenantConfig, TenantManager}, tenant::{TenantConfig, TenantManager},
}, },
}; };
use harmony_types::id::Id;
#[derive(Debug, Serialize, Clone)] #[derive(Debug, Serialize, Clone)]
pub struct TenantScore { pub struct TenantScore {

View File

@ -3,12 +3,14 @@ use derive_new::new;
use serde::Serialize; use serde::Serialize;
use crate::{ use crate::{
data::{Id, Version}, data::Version,
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome}, interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
inventory::Inventory, inventory::Inventory,
score::Score, score::Score,
topology::{Router, TftpServer, Topology, Url}, topology::{Router, TftpServer, Topology},
}; };
use harmony_types::id::Id;
use harmony_types::net::Url;
#[derive(Debug, new, Clone, Serialize)] #[derive(Debug, new, Clone, Serialize)]
pub struct TftpScore { pub struct TftpScore {

View File

@ -12,6 +12,9 @@ log.workspace = true
env_logger.workspace = true env_logger.workspace = true
tokio.workspace = true tokio.workspace = true
thiserror.workspace = true thiserror.workspace = true
reqwest.workspace = true
# mdns-sd = "0.14.1" # mdns-sd = "0.14.1"
mdns-sd = { git = "https://github.com/jggc/mdns-sd.git", branch = "patch-1" } mdns-sd = { git = "https://github.com/jggc/mdns-sd.git", branch = "patch-1" }
local-ip-address = "0.6.5" local-ip-address = "0.6.5"
harmony_types = { path = "../harmony_types" }
harmony_macros = { path = "../harmony_macros" }

View File

@ -0,0 +1,15 @@
use crate::hwinfo::PhysicalHost;
pub async fn get_host_inventory(host: &str, port: u16) -> Result<PhysicalHost, String> {
let url = format!("http://{host}:{port}/inventory");
let client = reqwest::Client::new();
let response = client
.get(url)
.send()
.await
.map_err(|e| format!("Failed to download file: {e}"))?;
let host = response.json().await.map_err(|e| e.to_string())?;
Ok(host)
}

View File

@ -1,3 +1,4 @@
use harmony_types::net::MacAddress;
use log::{debug, warn}; use log::{debug, warn};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::Value; use serde_json::Value;
@ -18,7 +19,7 @@ pub struct PhysicalHost {
pub host_uuid: String, pub host_uuid: String,
} }
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug, Clone)]
pub struct StorageDrive { pub struct StorageDrive {
pub name: String, pub name: String,
pub model: String, pub model: String,
@ -32,13 +33,30 @@ pub struct StorageDrive {
pub smart_status: Option<String>, pub smart_status: Option<String>,
} }
impl StorageDrive {
pub fn dummy() -> Self {
Self {
name: String::new(),
model: String::new(),
serial: String::new(),
size_bytes: 0,
logical_block_size: 0,
physical_block_size: 0,
rotational: false,
wwn: None,
interface_type: String::new(),
smart_status: None,
}
}
}
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
pub struct StorageController { pub struct StorageController {
pub name: String, pub name: String,
pub driver: String, pub driver: String,
} }
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug, Clone)]
pub struct MemoryModule { pub struct MemoryModule {
pub size_bytes: u64, pub size_bytes: u64,
pub speed_mhz: Option<u32>, pub speed_mhz: Option<u32>,
@ -48,7 +66,7 @@ pub struct MemoryModule {
pub rank: Option<u8>, pub rank: Option<u8>,
} }
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug, Clone)]
pub struct CPU { pub struct CPU {
pub model: String, pub model: String,
pub vendor: String, pub vendor: String,
@ -63,10 +81,10 @@ pub struct Chipset {
pub vendor: String, pub vendor: String,
} }
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug, Clone)]
pub struct NetworkInterface { pub struct NetworkInterface {
pub name: String, pub name: String,
pub mac_address: String, pub mac_address: MacAddress,
pub speed_mbps: Option<u32>, pub speed_mbps: Option<u32>,
pub is_up: bool, pub is_up: bool,
pub mtu: u32, pub mtu: u32,
@ -76,6 +94,24 @@ pub struct NetworkInterface {
pub firmware_version: Option<String>, pub firmware_version: Option<String>,
} }
impl NetworkInterface {
pub fn dummy() -> Self {
use harmony_macros::mac_address;
Self {
name: String::new(),
mac_address: mac_address!("00:00:00:00:00:00"),
speed_mbps: Some(0),
is_up: false,
mtu: 0,
ipv4_addresses: vec![],
ipv6_addresses: vec![],
driver: String::new(),
firmware_version: None,
}
}
}
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
pub struct ManagementInterface { pub struct ManagementInterface {
pub kind: String, pub kind: String,
@ -509,6 +545,7 @@ impl PhysicalHost {
let mac_address = Self::read_sysfs_string(&iface_path.join("address")) let mac_address = Self::read_sysfs_string(&iface_path.join("address"))
.map_err(|e| format!("Failed to read MAC address for {}: {}", iface_name, e))?; .map_err(|e| format!("Failed to read MAC address for {}: {}", iface_name, e))?;
let mac_address = MacAddress::try_from(mac_address).map_err(|e| e.to_string())?;
let speed_mbps = if iface_path.join("speed").exists() { let speed_mbps = if iface_path.join("speed").exists() {
match Self::read_sysfs_u32(&iface_path.join("speed")) { match Self::read_sysfs_u32(&iface_path.join("speed")) {

View File

@ -1,2 +1,3 @@
mod hwinfo; pub mod client;
pub mod hwinfo;
pub mod local_presence; pub mod local_presence;

View File

@ -1,10 +1,13 @@
use log::{debug, error};
use mdns_sd::{ServiceDaemon, ServiceEvent}; use mdns_sd::{ServiceDaemon, ServiceEvent};
use crate::local_presence::SERVICE_NAME; use crate::local_presence::SERVICE_NAME;
pub type DiscoveryEvent = ServiceEvent; pub type DiscoveryEvent = ServiceEvent;
pub fn discover_agents(timeout: Option<u64>, on_event: impl Fn(DiscoveryEvent) + Send + 'static) pub async fn discover_agents<F>(timeout: Option<u64>, on_event: F)
where
F: FnOnce(DiscoveryEvent) -> Result<(), String> + Send + 'static + Copy,
{ {
// Create a new mDNS daemon. // Create a new mDNS daemon.
let mdns = ServiceDaemon::new().expect("Failed to create mDNS daemon"); let mdns = ServiceDaemon::new().expect("Failed to create mDNS daemon");
@ -13,23 +16,24 @@ pub fn discover_agents(timeout: Option<u64>, on_event: impl Fn(DiscoveryEvent) +
// The receiver will be a stream of events. // The receiver will be a stream of events.
let receiver = mdns.browse(SERVICE_NAME).expect("Failed to browse"); let receiver = mdns.browse(SERVICE_NAME).expect("Failed to browse");
std::thread::spawn(move || { tokio::task::spawn_blocking(move || {
while let Ok(event) = receiver.recv() { while let Ok(event) = receiver.recv() {
on_event(event.clone()); if let Err(e) = on_event(event.clone()) {
error!("Event callback failed : {e}");
}
match event { match event {
ServiceEvent::ServiceResolved(resolved) => { ServiceEvent::ServiceResolved(resolved) => {
println!("Resolved a new service: {}", resolved.fullname); debug!("Resolved a new service: {}", resolved.fullname);
} }
other_event => { other_event => {
println!("Received other event: {:?}", &other_event); debug!("Received other event: {:?}", &other_event);
} }
} }
} }
}); });
if let Some(timeout) = timeout { if let Some(timeout) = timeout {
// Gracefully shutdown the daemon. tokio::time::sleep(std::time::Duration::from_secs(timeout)).await;
std::thread::sleep(std::time::Duration::from_secs(timeout));
mdns.shutdown().unwrap(); mdns.shutdown().unwrap();
} }
} }

View File

@ -6,4 +6,6 @@ readme.workspace = true
license.workspace = true license.workspace = true
[dependencies] [dependencies]
serde = { version = "1.0.209", features = ["derive"] } serde.workspace = true
url.workspace = true
rand.workspace = true

72
harmony_types/src/id.rs Normal file
View File

@ -0,0 +1,72 @@
use rand::distr::Alphanumeric;
use rand::distr::SampleString;
use std::str::FromStr;
use std::time::SystemTime;
use std::time::UNIX_EPOCH;
use serde::{Deserialize, Serialize};
/// A unique identifier designed for ease of use.
///
/// You can pass it any String to use and Id, or you can use the default format with `Id::default()`
///
/// The default format looks like this
///
/// `462d4c_g2COgai`
///
/// The first part is the unix timesamp in hexadecimal which makes Id easily sorted by creation time.
/// Second part is a serie of 7 random characters.
///
/// **It is not meant to be very secure or unique**, it is suitable to generate up to 10 000 items per
/// second with a reasonable collision rate of 0,000014 % as calculated by this calculator : https://kevingal.com/apps/collision.html
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct Id {
value: String,
}
impl Id {
pub fn empty() -> Self {
Id {
value: String::new(),
}
}
}
impl FromStr for Id {
type Err = ();
fn from_str(s: &str) -> Result<Self, Self::Err> {
Ok(Id {
value: s.to_string(),
})
}
}
impl From<String> for Id {
fn from(value: String) -> Self {
Self { value }
}
}
impl std::fmt::Display for Id {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.write_str(&self.value)
}
}
impl Default for Id {
fn default() -> Self {
let start = SystemTime::now();
let since_the_epoch = start
.duration_since(UNIX_EPOCH)
.expect("Time went backwards");
let timestamp = since_the_epoch.as_secs();
let hex_timestamp = format!("{:x}", timestamp & 0xffffff);
let random_part: String = Alphanumeric.sample_string(&mut rand::rng(), 7);
let value = format!("{}_{}", hex_timestamp, random_part);
Self { value }
}
}

View File

@ -1,28 +1,2 @@
pub mod net { pub mod id;
use serde::Serialize; pub mod net;
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize)]
pub struct MacAddress(pub [u8; 6]);
impl MacAddress {
#[cfg(test)]
pub fn dummy() -> Self {
Self([0, 0, 0, 0, 0, 0])
}
}
impl From<&MacAddress> for String {
fn from(value: &MacAddress) -> Self {
format!(
"{:02x}:{:02x}:{:02x}:{:02x}:{:02x}:{:02x}",
value.0[0], value.0[1], value.0[2], value.0[3], value.0[4], value.0[5]
)
}
}
impl std::fmt::Display for MacAddress {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.write_fmt(format_args!("MacAddress {}", String::from(self)))
}
}
}

79
harmony_types/src/net.rs Normal file
View File

@ -0,0 +1,79 @@
use serde::{Deserialize, Serialize};
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub struct MacAddress(pub [u8; 6]);
impl MacAddress {
#[cfg(test)]
pub fn dummy() -> Self {
Self([0, 0, 0, 0, 0, 0])
}
}
impl From<&MacAddress> for String {
fn from(value: &MacAddress) -> Self {
format!(
"{:02x}:{:02x}:{:02x}:{:02x}:{:02x}:{:02x}",
value.0[0], value.0[1], value.0[2], value.0[3], value.0[4], value.0[5]
)
}
}
impl std::fmt::Display for MacAddress {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.write_fmt(format_args!("MacAddress {}", String::from(self)))
}
}
impl TryFrom<String> for MacAddress {
type Error = std::io::Error;
fn try_from(value: String) -> Result<Self, Self::Error> {
let parts: Vec<&str> = value.split(':').collect();
if parts.len() != 6 {
return Err(std::io::Error::new(
std::io::ErrorKind::InvalidInput,
"Invalid MAC address format: expected 6 colon-separated hex pairs",
));
}
let mut bytes = [0u8; 6];
for (i, part) in parts.iter().enumerate() {
bytes[i] = u8::from_str_radix(part, 16).map_err(|_| {
std::io::Error::new(
std::io::ErrorKind::InvalidInput,
format!("Invalid hex value in part {}: '{}'", i, part),
)
})?;
}
Ok(MacAddress(bytes))
}
}
pub type IpAddress = std::net::IpAddr;
#[derive(Debug, Clone)]
pub enum Url {
LocalFolder(String),
Url(url::Url),
}
impl Serialize for Url {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
match self {
Url::LocalFolder(path) => serializer.serialize_str(path),
Url::Url(url) => serializer.serialize_str(url.as_str()),
}
}
}
impl std::fmt::Display for Url {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Url::LocalFolder(path) => write!(f, "{}", path),
Url::Url(url) => write!(f, "{}", url),
}
}
}

View File

@ -0,0 +1,8 @@
-- Add migration script here
CREATE TABLE IF NOT EXISTS physical_hosts (
version_id TEXT PRIMARY KEY NOT NULL,
id TEXT NOT NULL,
data JSON NOT NULL
);
CREATE INDEX IF NOT EXISTS idx_host_id_time
ON physical_hosts (id, version_id DESC);