From 6899ba21adc713f57a6891d86929fc76be80f8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Sj=C3=B6strom?= <lars@radicore.se> Date: Wed, 8 Jan 2025 11:09:34 +0100 Subject: [PATCH 1/3] feat(hostd): varlink interfaced host controller to manage machine configuration and boot mgmt --- Cargo.lock | 262 ++++++++++++++++++----- Cargo.toml | 1 + hostd/.gitignore | 1 + hostd/Cargo.toml | 15 ++ hostd/build.rs | 6 + hostd/src/io.patagia.Hostd.varlink | 27 +++ hostd/src/io.systemd.Hostname.varlink | 32 +++ hostd/src/io_patagia_Hostd.rs | 264 +++++++++++++++++++++++ hostd/src/io_systemd_Hostname.rs | 295 ++++++++++++++++++++++++++ hostd/src/main.rs | 63 ++++++ 10 files changed, 914 insertions(+), 52 deletions(-) create mode 100644 hostd/.gitignore create mode 100644 hostd/Cargo.toml create mode 100644 hostd/build.rs create mode 100644 hostd/src/io.patagia.Hostd.varlink create mode 100644 hostd/src/io.systemd.Hostname.varlink create mode 100644 hostd/src/io_patagia_Hostd.rs create mode 100644 hostd/src/io_systemd_Hostname.rs create mode 100644 hostd/src/main.rs diff --git a/Cargo.lock b/Cargo.lock index 67b0d67..100d5ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,7 @@ version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "once_cell", "version_check", "zerocopy", @@ -59,6 +59,15 @@ dependencies = [ "libc", ] +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + [[package]] name = "anstream" version = "0.6.18" @@ -133,7 +142,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -144,7 +153,7 @@ checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -222,7 +231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cfg-if", + "cfg-if 1.0.0", "libc", "miniz_oxide", "object", @@ -298,6 +307,12 @@ dependencies = [ "shlex", ] +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + [[package]] name = "cfg-if" version = "1.0.0" @@ -310,6 +325,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "chainerror" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce1bb7fb0c258a6600d699950da347a7a9dad66c3ce815769b5f11cf8fce78e" + [[package]] name = "chrono" version = "0.4.39" @@ -355,7 +376,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -441,7 +462,7 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -522,7 +543,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "dirs-sys-next", ] @@ -545,7 +566,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -616,7 +637,7 @@ dependencies = [ "semver", "serde", "serde_tokenstream", - "syn", + "syn 2.0.95", ] [[package]] @@ -640,7 +661,7 @@ version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -665,7 +686,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "home", "windows-sys 0.48.0", ] @@ -811,7 +832,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -854,13 +875,22 @@ dependencies = [ "version_check", ] +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + [[package]] name = "getrandom" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "js-sys", "libc", "wasi", @@ -979,6 +1009,19 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "hostd" +version = "0.2.0" +dependencies = [ + "anyhow", + "serde", + "serde_derive", + "serde_json", + "tokio", + "varlink", + "varlink_generator", +] + [[package]] name = "hostname" version = "0.3.1" @@ -996,7 +1039,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "windows", ] @@ -1272,7 +1315,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -1488,7 +1531,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "digest", ] @@ -1498,6 +1541,15 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.17" @@ -1663,7 +1715,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 1.0.0", "foreign-types", "libc", "once_cell", @@ -1679,7 +1731,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -1825,7 +1877,7 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", @@ -1876,6 +1928,33 @@ dependencies = [ "uuid", ] +[[package]] +name = "peg" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f76678828272f177ac33b7e2ac2e3e73cc6c1cd1e3e387928aa69562fa51367" +dependencies = [ + "peg-macros", + "peg-runtime", +] + +[[package]] +name = "peg-macros" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "636d60acf97633e48d266d7415a9355d4389cea327a193f87df395d88cd2b14d" +dependencies = [ + "peg-runtime", + "proc-macro2", + "quote", +] + +[[package]] +name = "peg-runtime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9555b1514d2d99d78150d3c799d4c357a3e2c2a8062cd108e93a06d9057629c5" + [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -1908,7 +1987,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -2016,7 +2095,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "syn", + "syn 2.0.95", "thiserror 1.0.69", "typify", "unicode-ident", @@ -2037,7 +2116,7 @@ dependencies = [ "serde_json", "serde_tokenstream", "serde_yaml", - "syn", + "syn 2.0.95", ] [[package]] @@ -2060,7 +2139,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -2286,7 +2365,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "cfg-if", + "cfg-if 1.0.0", "getrandom", "libc", "spin", @@ -2453,7 +2532,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn", + "syn 2.0.95", ] [[package]] @@ -2524,7 +2603,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -2535,14 +2614,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", @@ -2578,7 +2657,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn", + "syn 2.0.95", ] [[package]] @@ -2612,7 +2691,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest", ] @@ -2623,7 +2702,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest", ] @@ -2825,7 +2904,7 @@ dependencies = [ "quote", "sqlx-core", "sqlx-macros-core", - "syn", + "syn 2.0.95", ] [[package]] @@ -2848,7 +2927,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn", + "syn 2.0.95", "tempfile", "tokio", "url", @@ -2991,6 +3070,17 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "syn" version = "2.0.95" @@ -3019,7 +3109,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -3055,7 +3145,7 @@ version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "fastrand", "getrandom", "once_cell", @@ -3110,7 +3200,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -3121,7 +3211,7 @@ checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -3130,7 +3220,7 @@ version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "once_cell", ] @@ -3218,7 +3308,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -3400,7 +3490,7 @@ dependencies = [ "http", "proc-macro2", "quote", - "syn", + "syn 2.0.95", "tracing", ] @@ -3424,7 +3514,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -3528,7 +3618,7 @@ dependencies = [ "semver", "serde", "serde_json", - "syn", + "syn 2.0.95", "thiserror 1.0.69", "unicode-ident", ] @@ -3546,10 +3636,21 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream", - "syn", + "syn 2.0.95", "typify-impl", ] +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset", + "tempfile", + "winapi", +] + [[package]] name = "unicode-bidi" version = "0.3.18" @@ -3577,6 +3678,22 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unix_socket" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aa2700417c405c38f5e6902d699345241c28c0b7ade4abaad71e35a87eb1564" +dependencies = [ + "cfg-if 0.1.10", + "libc", +] + [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -3634,6 +3751,47 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "varlink" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "409e275987d74665c23610c0959c133360cafd761c1a6ddb1ca6d0685c8cef5d" +dependencies = [ + "libc", + "serde", + "serde_derive", + "serde_json", + "tempfile", + "uds_windows", + "unix_socket", + "winapi", +] + +[[package]] +name = "varlink_generator" +version = "10.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d8ff746c5b65d4bfb3a50f630b85cfb6a9d59f18720126e3ebd6bc98527fa51" +dependencies = [ + "chainerror", + "getopts", + "proc-macro2", + "quote", + "syn 1.0.109", + "varlink_parser", +] + +[[package]] +name = "varlink_parser" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35fb9f3c1e8ccb33cdb6c84a4477ef3f3884ce6f4b70514ef1fbf7686eae921e" +dependencies = [ + "ansi_term", + "chainerror", + "peg", +] + [[package]] name = "vcpkg" version = "0.2.15" @@ -3682,7 +3840,7 @@ version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "once_cell", "wasm-bindgen-macro", ] @@ -3697,7 +3855,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn", + "syn 2.0.95", "wasm-bindgen-shared", ] @@ -3707,7 +3865,7 @@ version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "js-sys", "once_cell", "wasm-bindgen", @@ -3732,7 +3890,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4065,7 +4223,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", "synstructure", ] @@ -4087,7 +4245,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -4107,7 +4265,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", "synstructure", ] @@ -4136,7 +4294,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index ca5b5c1..653c291 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,7 @@ members = [ "agent", "controller", "instrumentation", + "hostd", "trace-request", "xtask", ] diff --git a/hostd/.gitignore b/hostd/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/hostd/.gitignore @@ -0,0 +1 @@ +/target diff --git a/hostd/Cargo.toml b/hostd/Cargo.toml new file mode 100644 index 0000000..fc9c6c3 --- /dev/null +++ b/hostd/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "hostd" +version.workspace = true +edition.workspace = true + +[dependencies] +anyhow.workspace = true +serde.workspace = true +serde_derive = "1.0.217" +serde_json = "1.0.135" +tokio.workspace = true +varlink = "11.0.1" + +[build-dependencies] +varlink_generator = "10.1.0" diff --git a/hostd/build.rs b/hostd/build.rs new file mode 100644 index 0000000..c12279a --- /dev/null +++ b/hostd/build.rs @@ -0,0 +1,6 @@ +extern crate varlink_generator; + +fn main() { + varlink_generator::cargo_build_tosource("src/io.systemd.Hostname.varlink", true); + varlink_generator::cargo_build_tosource("src/io.patagia.Hostd.varlink", true); +} diff --git a/hostd/src/io.patagia.Hostd.varlink b/hostd/src/io.patagia.Hostd.varlink new file mode 100644 index 0000000..46123a8 --- /dev/null +++ b/hostd/src/io.patagia.Hostd.varlink @@ -0,0 +1,27 @@ +interface io.patagia.Hostd + +type Label ( + key: string, + value: string +) + +type PatagiaAgentConfig ( + url: string, + extraMounts: [string]string +) + +type Machine( + machineId: string, + nodeLabels: ?[]Label, + patagiaAgent: ?PatagiaAgentConfig +) + +method Describe() -> ( + machine: Machine +) + +method Apply( + machine: Machine +) -> () + +error InvalidMachineConfig() diff --git a/hostd/src/io.systemd.Hostname.varlink b/hostd/src/io.systemd.Hostname.varlink new file mode 100644 index 0000000..be4cf01 --- /dev/null +++ b/hostd/src/io.systemd.Hostname.varlink @@ -0,0 +1,32 @@ +interface io.systemd.Hostname + +method Describe() -> ( + Hostname: string, + StaticHostname: ?string, + PrettyHostname: ?string, + DefaultHostname: ?string, + HostnameSource: string, + IconName: ?string, + Chassis: ?string, + Deployment: ?string, + Location: ?string, + KernelName: string, + KernelRelease: string, + KernelVersion: string, + OperatingSystemPrettyName: ?string, + OperatingSystemCPEName: ?string, + OperatingSystemHomeURL: ?string, + OperatingSystemSupportEnd: ?int, + OperatingSystemReleaseData: ?[]string, + MachineInformationData: ?[]string, + HardwareVendor: ?string, + HardwareModel: ?string, + HardwareSerial: ?string, + FirmwareVersion: ?string, + FirmwareVendor: ?string, + FirmwareDate: ?int, + MachineID: string, + BootID: string, + ProductUUID: ?string, + VSockCID: ?int +) diff --git a/hostd/src/io_patagia_Hostd.rs b/hostd/src/io_patagia_Hostd.rs new file mode 100644 index 0000000..a2de13d --- /dev/null +++ b/hostd/src/io_patagia_Hostd.rs @@ -0,0 +1,264 @@ +#![doc = "This file was automatically generated by the varlink rust generator"] +#![allow(non_camel_case_types)] +#![allow(non_snake_case)] +use serde_derive::{Deserialize, Serialize}; +use std::io::BufRead; +use std::sync::{Arc, RwLock}; +use varlink::{self, CallTrait}; +#[allow(dead_code)] +#[derive(Clone, PartialEq, Debug)] +#[allow(clippy::enum_variant_names)] +pub enum ErrorKind { + Varlink_Error, + VarlinkReply_Error, + InvalidMachineConfig(Option<InvalidMachineConfig_Args>), +} +impl ::std::fmt::Display for ErrorKind { + fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + match self { + ErrorKind::Varlink_Error => write!(f, "Varlink Error"), + ErrorKind::VarlinkReply_Error => write!(f, "Varlink error reply"), + ErrorKind::InvalidMachineConfig(v) => { + write!(f, "io.patagia.Hostd.InvalidMachineConfig: {:#?}", v) + } + } + } +} +pub struct Error( + pub ErrorKind, + pub Option<Box<dyn std::error::Error + 'static + Send + Sync>>, + pub Option<&'static str>, +); +impl Error { + #[allow(dead_code)] + pub fn kind(&self) -> &ErrorKind { + &self.0 + } +} +impl From<ErrorKind> for Error { + fn from(e: ErrorKind) -> Self { + Error(e, None, None) + } +} +impl std::error::Error for Error { + fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { + self.1 + .as_ref() + .map(|e| e.as_ref() as &(dyn std::error::Error + 'static)) + } +} +impl std::fmt::Display for Error { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + std::fmt::Display::fmt(&self.0, f) + } +} +impl std::fmt::Debug for Error { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + use std::error::Error as StdError; + if let Some(ref o) = self.2 { + std::fmt::Display::fmt(o, f)?; + } + std::fmt::Debug::fmt(&self.0, f)?; + if let Some(e) = self.source() { + std::fmt::Display::fmt("\nCaused by:\n", f)?; + std::fmt::Debug::fmt(&e, f)?; + } + Ok(()) + } +} +#[allow(dead_code)] +pub type Result<T> = std::result::Result<T, Error>; +impl From<varlink::Error> for Error { + fn from(e: varlink::Error) -> Self { + match e.kind() { + varlink::ErrorKind::VarlinkErrorReply(r) => Error( + ErrorKind::from(r), + Some(Box::from(e)), + Some(concat!(file!(), ":", line!(), ": ")), + ), + _ => Error( + ErrorKind::Varlink_Error, + Some(Box::from(e)), + Some(concat!(file!(), ":", line!(), ": ")), + ), + } + } +} +#[allow(dead_code)] +impl Error { + pub fn source_varlink_kind(&self) -> Option<&varlink::ErrorKind> { + use std::error::Error as StdError; + let mut s: &dyn StdError = self; + while let Some(c) = s.source() { + let k = self + .source() + .and_then(|e| e.downcast_ref::<varlink::Error>()) + .map(|e| e.kind()); + if k.is_some() { + return k; + } + s = c; + } + None + } +} +impl From<&varlink::Reply> for ErrorKind { + #[allow(unused_variables)] + fn from(e: &varlink::Reply) -> Self { + match e { + varlink::Reply { + error: Some(ref t), .. + } if t == "io.patagia.Hostd.InvalidMachineConfig" => match e { + varlink::Reply { + parameters: Some(p), + .. + } => match serde_json::from_value(p.clone()) { + Ok(v) => ErrorKind::InvalidMachineConfig(v), + Err(_) => ErrorKind::InvalidMachineConfig(None), + }, + _ => ErrorKind::InvalidMachineConfig(None), + }, + _ => ErrorKind::VarlinkReply_Error, + } + } +} +pub trait VarlinkCallError: varlink::CallTrait { + fn reply_invalid_machine_config(&mut self) -> varlink::Result<()> { + self.reply_struct(varlink::Reply::error( + "io.patagia.Hostd.InvalidMachineConfig", + None, + )) + } +} +impl<'a> VarlinkCallError for varlink::Call<'a> {} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct r#Label { + pub r#key: String, + pub r#value: String, +} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct r#Machine { + pub r#machineId: String, + pub r#nodeLabels: Option<Vec<Label>>, + pub r#patagiaAgent: Option<PatagiaAgentConfig>, +} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct r#PatagiaAgentConfig { + pub r#url: String, + pub r#extraMounts: varlink::StringHashMap<String>, +} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct InvalidMachineConfig_Args {} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct Apply_Reply {} +impl varlink::VarlinkReply for Apply_Reply {} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct Apply_Args { + pub r#machine: Machine, +} +pub trait Call_Apply: VarlinkCallError { + fn reply(&mut self) -> varlink::Result<()> { + self.reply_struct(varlink::Reply::parameters(None)) + } +} +impl<'a> Call_Apply for varlink::Call<'a> {} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct Describe_Reply { + pub r#machine: Machine, +} +impl varlink::VarlinkReply for Describe_Reply {} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct Describe_Args {} +pub trait Call_Describe: VarlinkCallError { + fn reply(&mut self, r#machine: Machine) -> varlink::Result<()> { + self.reply_struct(Describe_Reply { r#machine }.into()) + } +} +impl<'a> Call_Describe for varlink::Call<'a> {} +pub trait VarlinkInterface { + fn apply(&self, call: &mut dyn Call_Apply, r#machine: Machine) -> varlink::Result<()>; + fn describe(&self, call: &mut dyn Call_Describe) -> varlink::Result<()>; + fn call_upgraded( + &self, + _call: &mut varlink::Call, + _bufreader: &mut dyn BufRead, + ) -> varlink::Result<Vec<u8>> { + Ok(Vec::new()) + } +} +pub trait VarlinkClientInterface { + fn apply(&mut self, r#machine: Machine) -> varlink::MethodCall<Apply_Args, Apply_Reply, Error>; + fn describe(&mut self) -> varlink::MethodCall<Describe_Args, Describe_Reply, Error>; +} +#[allow(dead_code)] +pub struct VarlinkClient { + connection: Arc<RwLock<varlink::Connection>>, +} +impl VarlinkClient { + #[allow(dead_code)] + pub fn new(connection: Arc<RwLock<varlink::Connection>>) -> Self { + VarlinkClient { connection } + } +} +impl VarlinkClientInterface for VarlinkClient { + fn apply(&mut self, r#machine: Machine) -> varlink::MethodCall<Apply_Args, Apply_Reply, Error> { + varlink::MethodCall::<Apply_Args, Apply_Reply, Error>::new( + self.connection.clone(), + "io.patagia.Hostd.Apply", + Apply_Args { r#machine }, + ) + } + fn describe(&mut self) -> varlink::MethodCall<Describe_Args, Describe_Reply, Error> { + varlink::MethodCall::<Describe_Args, Describe_Reply, Error>::new( + self.connection.clone(), + "io.patagia.Hostd.Describe", + Describe_Args {}, + ) + } +} +#[allow(dead_code)] +pub struct VarlinkInterfaceProxy { + inner: Box<dyn VarlinkInterface + Send + Sync>, +} +#[allow(dead_code)] +pub fn new(inner: Box<dyn VarlinkInterface + Send + Sync>) -> VarlinkInterfaceProxy { + VarlinkInterfaceProxy { inner } +} +impl varlink::Interface for VarlinkInterfaceProxy { + fn get_description(&self) -> &'static str { + "interface io.patagia.Hostd\n\ntype Label (\n key: string,\n value: string\n)\n\ntype PatagiaAgentConfig (\n url: string,\n extraMounts: [string]string\n)\n\ntype Machine(\n machineId: string,\n nodeLabels: ?[]Label,\n patagiaAgent: ?PatagiaAgentConfig\n)\n\nmethod Describe() -> (\n machine: Machine\n)\n\nmethod Apply(\n machine: Machine\n) -> ()\n\nerror InvalidMachineConfig()\n" + } + fn get_name(&self) -> &'static str { + "io.patagia.Hostd" + } + fn call_upgraded( + &self, + call: &mut varlink::Call, + bufreader: &mut dyn BufRead, + ) -> varlink::Result<Vec<u8>> { + self.inner.call_upgraded(call, bufreader) + } + fn call(&self, call: &mut varlink::Call) -> varlink::Result<()> { + let req = call.request.unwrap(); + match req.method.as_ref() { + "io.patagia.Hostd.Apply" => { + if let Some(args) = req.parameters.clone() { + let args: Apply_Args = match serde_json::from_value(args) { + Ok(v) => v, + Err(e) => { + let es = format!("{}", e); + let _ = call.reply_invalid_parameter(es.clone()); + return Err(varlink::context!(varlink::ErrorKind::SerdeJsonDe(es))); + } + }; + self.inner + .apply(call as &mut dyn Call_Apply, args.r#machine) + } else { + call.reply_invalid_parameter("parameters".into()) + } + } + "io.patagia.Hostd.Describe" => self.inner.describe(call as &mut dyn Call_Describe), + m => call.reply_method_not_found(String::from(m)), + } + } +} diff --git a/hostd/src/io_systemd_Hostname.rs b/hostd/src/io_systemd_Hostname.rs new file mode 100644 index 0000000..e9fa185 --- /dev/null +++ b/hostd/src/io_systemd_Hostname.rs @@ -0,0 +1,295 @@ +#![doc = "This file was automatically generated by the varlink rust generator"] +#![allow(non_camel_case_types)] +#![allow(non_snake_case)] +use serde_derive::{Deserialize, Serialize}; +use std::io::BufRead; +use std::sync::{Arc, RwLock}; +use varlink::{self, CallTrait}; +#[allow(dead_code)] +#[derive(Clone, PartialEq, Debug)] +#[allow(clippy::enum_variant_names)] +pub enum ErrorKind { + Varlink_Error, + VarlinkReply_Error, +} +impl ::std::fmt::Display for ErrorKind { + fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + match self { + ErrorKind::Varlink_Error => write!(f, "Varlink Error"), + ErrorKind::VarlinkReply_Error => write!(f, "Varlink error reply"), + } + } +} +pub struct Error( + pub ErrorKind, + pub Option<Box<dyn std::error::Error + 'static + Send + Sync>>, + pub Option<&'static str>, +); +impl Error { + #[allow(dead_code)] + pub fn kind(&self) -> &ErrorKind { + &self.0 + } +} +impl From<ErrorKind> for Error { + fn from(e: ErrorKind) -> Self { + Error(e, None, None) + } +} +impl std::error::Error for Error { + fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { + self.1 + .as_ref() + .map(|e| e.as_ref() as &(dyn std::error::Error + 'static)) + } +} +impl std::fmt::Display for Error { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + std::fmt::Display::fmt(&self.0, f) + } +} +impl std::fmt::Debug for Error { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + use std::error::Error as StdError; + if let Some(ref o) = self.2 { + std::fmt::Display::fmt(o, f)?; + } + std::fmt::Debug::fmt(&self.0, f)?; + if let Some(e) = self.source() { + std::fmt::Display::fmt("\nCaused by:\n", f)?; + std::fmt::Debug::fmt(&e, f)?; + } + Ok(()) + } +} +#[allow(dead_code)] +pub type Result<T> = std::result::Result<T, Error>; +impl From<varlink::Error> for Error { + fn from(e: varlink::Error) -> Self { + match e.kind() { + varlink::ErrorKind::VarlinkErrorReply(r) => Error( + ErrorKind::from(r), + Some(Box::from(e)), + Some(concat!(file!(), ":", line!(), ": ")), + ), + _ => Error( + ErrorKind::Varlink_Error, + Some(Box::from(e)), + Some(concat!(file!(), ":", line!(), ": ")), + ), + } + } +} +#[allow(dead_code)] +impl Error { + pub fn source_varlink_kind(&self) -> Option<&varlink::ErrorKind> { + use std::error::Error as StdError; + let mut s: &dyn StdError = self; + while let Some(c) = s.source() { + let k = self + .source() + .and_then(|e| e.downcast_ref::<varlink::Error>()) + .map(|e| e.kind()); + if k.is_some() { + return k; + } + s = c; + } + None + } +} +impl From<&varlink::Reply> for ErrorKind { + #[allow(unused_variables)] + fn from(e: &varlink::Reply) -> Self { + match e { + _ => ErrorKind::VarlinkReply_Error, + } + } +} +pub trait VarlinkCallError: varlink::CallTrait {} +impl<'a> VarlinkCallError for varlink::Call<'a> {} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct Describe_Reply { + pub r#Hostname: String, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#StaticHostname: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#PrettyHostname: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#DefaultHostname: Option<String>, + pub r#HostnameSource: String, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#IconName: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#Chassis: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#Deployment: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#Location: Option<String>, + pub r#KernelName: String, + pub r#KernelRelease: String, + pub r#KernelVersion: String, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#OperatingSystemPrettyName: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#OperatingSystemCPEName: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#OperatingSystemHomeURL: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#OperatingSystemSupportEnd: Option<i64>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#OperatingSystemReleaseData: Option<Vec<String>>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#MachineInformationData: Option<Vec<String>>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#HardwareVendor: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#HardwareModel: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#HardwareSerial: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#FirmwareVersion: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#FirmwareVendor: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#FirmwareDate: Option<i64>, + pub r#MachineID: String, + pub r#BootID: String, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#ProductUUID: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#VSockCID: Option<i64>, +} +impl varlink::VarlinkReply for Describe_Reply {} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct Describe_Args {} +pub trait Call_Describe: VarlinkCallError { + fn reply( + &mut self, + r#Hostname: String, + r#StaticHostname: Option<String>, + r#PrettyHostname: Option<String>, + r#DefaultHostname: Option<String>, + r#HostnameSource: String, + r#IconName: Option<String>, + r#Chassis: Option<String>, + r#Deployment: Option<String>, + r#Location: Option<String>, + r#KernelName: String, + r#KernelRelease: String, + r#KernelVersion: String, + r#OperatingSystemPrettyName: Option<String>, + r#OperatingSystemCPEName: Option<String>, + r#OperatingSystemHomeURL: Option<String>, + r#OperatingSystemSupportEnd: Option<i64>, + r#OperatingSystemReleaseData: Option<Vec<String>>, + r#MachineInformationData: Option<Vec<String>>, + r#HardwareVendor: Option<String>, + r#HardwareModel: Option<String>, + r#HardwareSerial: Option<String>, + r#FirmwareVersion: Option<String>, + r#FirmwareVendor: Option<String>, + r#FirmwareDate: Option<i64>, + r#MachineID: String, + r#BootID: String, + r#ProductUUID: Option<String>, + r#VSockCID: Option<i64>, + ) -> varlink::Result<()> { + self.reply_struct( + Describe_Reply { + r#Hostname, + r#StaticHostname, + r#PrettyHostname, + r#DefaultHostname, + r#HostnameSource, + r#IconName, + r#Chassis, + r#Deployment, + r#Location, + r#KernelName, + r#KernelRelease, + r#KernelVersion, + r#OperatingSystemPrettyName, + r#OperatingSystemCPEName, + r#OperatingSystemHomeURL, + r#OperatingSystemSupportEnd, + r#OperatingSystemReleaseData, + r#MachineInformationData, + r#HardwareVendor, + r#HardwareModel, + r#HardwareSerial, + r#FirmwareVersion, + r#FirmwareVendor, + r#FirmwareDate, + r#MachineID, + r#BootID, + r#ProductUUID, + r#VSockCID, + } + .into(), + ) + } +} +impl<'a> Call_Describe for varlink::Call<'a> {} +pub trait VarlinkInterface { + fn describe(&self, call: &mut dyn Call_Describe) -> varlink::Result<()>; + fn call_upgraded( + &self, + _call: &mut varlink::Call, + _bufreader: &mut dyn BufRead, + ) -> varlink::Result<Vec<u8>> { + Ok(Vec::new()) + } +} +pub trait VarlinkClientInterface { + fn describe(&mut self) -> varlink::MethodCall<Describe_Args, Describe_Reply, Error>; +} +#[allow(dead_code)] +pub struct VarlinkClient { + connection: Arc<RwLock<varlink::Connection>>, +} +impl VarlinkClient { + #[allow(dead_code)] + pub fn new(connection: Arc<RwLock<varlink::Connection>>) -> Self { + VarlinkClient { connection } + } +} +impl VarlinkClientInterface for VarlinkClient { + fn describe(&mut self) -> varlink::MethodCall<Describe_Args, Describe_Reply, Error> { + varlink::MethodCall::<Describe_Args, Describe_Reply, Error>::new( + self.connection.clone(), + "io.systemd.Hostname.Describe", + Describe_Args {}, + ) + } +} +#[allow(dead_code)] +pub struct VarlinkInterfaceProxy { + inner: Box<dyn VarlinkInterface + Send + Sync>, +} +#[allow(dead_code)] +pub fn new(inner: Box<dyn VarlinkInterface + Send + Sync>) -> VarlinkInterfaceProxy { + VarlinkInterfaceProxy { inner } +} +impl varlink::Interface for VarlinkInterfaceProxy { + fn get_description(&self) -> &'static str { + "interface io.systemd.Hostname\n\nmethod Describe() -> (\n\tHostname: string,\n\tStaticHostname: ?string,\n\tPrettyHostname: ?string,\n\tDefaultHostname: ?string,\n\tHostnameSource: string,\n\tIconName: ?string,\n\tChassis: ?string,\n\tDeployment: ?string,\n\tLocation: ?string,\n\tKernelName: string,\n\tKernelRelease: string,\n\tKernelVersion: string,\n\tOperatingSystemPrettyName: ?string,\n\tOperatingSystemCPEName: ?string,\n\tOperatingSystemHomeURL: ?string,\n\tOperatingSystemSupportEnd: ?int,\n\tOperatingSystemReleaseData: ?[]string,\n\tMachineInformationData: ?[]string,\n\tHardwareVendor: ?string,\n\tHardwareModel: ?string,\n\tHardwareSerial: ?string,\n\tFirmwareVersion: ?string,\n\tFirmwareVendor: ?string,\n\tFirmwareDate: ?int,\n\tMachineID: string,\n\tBootID: string,\n\tProductUUID: ?string,\n\tVSockCID: ?int\n)\n" + } + fn get_name(&self) -> &'static str { + "io.systemd.Hostname" + } + fn call_upgraded( + &self, + call: &mut varlink::Call, + bufreader: &mut dyn BufRead, + ) -> varlink::Result<Vec<u8>> { + self.inner.call_upgraded(call, bufreader) + } + fn call(&self, call: &mut varlink::Call) -> varlink::Result<()> { + let req = call.request.unwrap(); + match req.method.as_ref() { + "io.systemd.Hostname.Describe" => self.inner.describe(call as &mut dyn Call_Describe), + m => call.reply_method_not_found(String::from(m)), + } + } +} diff --git a/hostd/src/main.rs b/hostd/src/main.rs new file mode 100644 index 0000000..01ff4d2 --- /dev/null +++ b/hostd/src/main.rs @@ -0,0 +1,63 @@ +use std::{collections::HashMap, process::exit}; + +use crate::io_patagia_Hostd::{ + Call_Apply, Call_Describe, Label, Machine, PatagiaAgentConfig, VarlinkInterface, +}; + +mod io_patagia_Hostd; + +const LISTEN_ADDRESS: &str = "unix:/tmp/io.patagia.Hostd"; + +struct Hostd; + +impl VarlinkInterface for Hostd { + fn apply(&self, call: &mut dyn Call_Apply, machine: Machine) -> varlink::Result<()> { + println!("Machine: {:#?}", machine); + return call.reply(); + } + + fn describe(&self, call: &mut dyn Call_Describe) -> varlink::Result<()> { + let machine = Machine { + machineId: "1".to_string(), + nodeLabels: Option::from(vec![Label { + key: "key".to_string(), + value: "value".to_string(), + }]), + patagiaAgent: Option::from(PatagiaAgentConfig { + url: "https://cdn.patagia.dev/patagia-agent/stable".to_string(), + extraMounts: HashMap::new(), + }), + }; + return call.reply(machine); + } +} + +fn main() { + let hostd = Hostd; + let hostd_interface = io_patagia_Hostd::new(Box::new(hostd)); + + let svc = varlink::VarlinkService::new( + "io.patagia.Hostd", + "Host controller for patagia", + "0.1", + "https://patagia.dev", + vec![Box::new(hostd_interface)], + ); + let ret: Result<(), varlink::Error> = varlink::listen( + svc, + LISTEN_ADDRESS, + &varlink::ListenConfig { + // Listen forever (0 = forever) + idle_timeout: 0, + ..Default::default() + }, + ); + + exit(match ret { + Ok(_) => 0, + Err(e) => { + println!("Error: {}", e); + 1 + } + }); +} From eb8926c091ccce5e884cd8139301f0e0f0c10371 Mon Sep 17 00:00:00 2001 From: Daniel Lundin <dln@arity.se> Date: Tue, 14 Jan 2025 16:46:03 +0100 Subject: [PATCH 2/3] chore(cargo): update dependencies --- Cargo.lock | 229 +++++++++++++++++++++++++---------------------------- Cargo.toml | 6 +- 2 files changed, 109 insertions(+), 126 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 67b0d67..e2d7e26 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,18 +17,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -100,11 +88,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.6" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", + "once_cell", "windows-sys 0.59.0", ] @@ -138,9 +127,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.84" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", @@ -244,9 +233,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" dependencies = [ "serde", ] @@ -289,9 +278,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.7" +version = "1.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" +checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b" dependencies = [ "jobserver", "libc", @@ -325,9 +314,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.23" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783" dependencies = [ "clap_builder", "clap_derive", @@ -335,9 +324,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.23" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121" dependencies = [ "anstream", "anstyle", @@ -348,9 +337,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" dependencies = [ "heck", "proc-macro2", @@ -595,7 +584,7 @@ dependencies = [ "slog-bunyan", "slog-json", "slog-term", - "thiserror 2.0.9", + "thiserror 2.0.11", "tokio", "tokio-rustls 0.25.0", "toml", @@ -904,16 +893,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", -] - [[package]] name = "hashbrown" version = "0.15.2" @@ -1078,7 +1057,7 @@ dependencies = [ "http", "hyper", "hyper-util", - "rustls 0.23.20", + "rustls 0.23.21", "rustls-pki-types", "tokio", "tokio-rustls 0.26.1", @@ -1384,9 +1363,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -1435,9 +1414,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "litemap" @@ -1457,9 +1436,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "match_cfg" @@ -1506,9 +1485,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", ] @@ -1893,18 +1872,18 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" +checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" +checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" dependencies = [ "proc-macro2", "quote", @@ -1913,9 +1892,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -1967,18 +1946,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] [[package]] name = "progenitor" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "293df5b79211fbf0c1ebad6513ba451d267e9c15f5f19ee5d3da775e2dd27331" +checksum = "88f54bd2506c3e7b6e45b6ab16500abef551689021264f3be260ef7e295ac327" dependencies = [ "progenitor-client", "progenitor-impl", @@ -1987,9 +1966,9 @@ dependencies = [ [[package]] name = "progenitor-client" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a5db54eac3cae7007a0785854bc3e89fd418cca7dfc2207b99b43979154c1b" +checksum = "fdae8df95f0b2a7d6159a9c43b7380016b8d3b0fc1ece46871ecd2e0087cfaf6" dependencies = [ "bytes", "futures-core", @@ -2002,9 +1981,9 @@ dependencies = [ [[package]] name = "progenitor-impl" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d85934a440963a69f9f04f48507ff6e7aa2952a5b2d8f96cc37fa3dd5c270f66" +checksum = "37adc80a94c9cae890e82deeeecc9d8f2a5cb153256caaf1bf0f03611e537214" dependencies = [ "heck", "http", @@ -2017,16 +1996,16 @@ dependencies = [ "serde", "serde_json", "syn", - "thiserror 1.0.69", + "thiserror 2.0.11", "typify", "unicode-ident", ] [[package]] name = "progenitor-macro" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d99a5a259e2d65a4933054aa51717c70b6aba0522695731ac354a522124efc9b" +checksum = "fc3b2b9f0d5ba58375c5e8e89d5dff949108e234c1d9f22a3336d2be4daaf292" dependencies = [ "openapiv3", "proc-macro2", @@ -2074,9 +2053,9 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.20", + "rustls 0.23.21", "socket2", - "thiserror 2.0.9", + "thiserror 2.0.11", "tokio", "tracing", ] @@ -2092,10 +2071,10 @@ dependencies = [ "rand", "ring", "rustc-hash", - "rustls 0.23.20", + "rustls 0.23.21", "rustls-pki-types", "slab", - "thiserror 2.0.9", + "thiserror 2.0.11", "tinyvec", "tracing", "web-time", @@ -2220,11 +2199,11 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "regress" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1541daf4e4ed43a0922b7969bdc2170178bcacc5dabf7e39bc508a9fa3953a7a" +checksum = "4f56e622c2378013c6c61e2bd776604c46dc1087b2dc5293275a0c20a44f0771" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.2", "memchr", ] @@ -2256,7 +2235,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.20", + "rustls 0.23.21", "rustls-pemfile", "rustls-pki-types", "serde", @@ -2328,9 +2307,9 @@ checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ "bitflags", "errno", @@ -2355,9 +2334,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.20" +version = "0.23.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" +checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" dependencies = [ "log", "once_cell", @@ -2377,7 +2356,7 @@ dependencies = [ "openssl-probe", "rustls-pki-types", "schannel", - "security-framework 3.1.0", + "security-framework 3.2.0", ] [[package]] @@ -2477,9 +2456,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d3f8c9bfcc3cbb6b0179eb57042d75b1582bdc65c3cb95f3fa999509c03cbc" +checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" dependencies = [ "bitflags", "core-foundation 0.10.0", @@ -2490,9 +2469,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -2540,9 +2519,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", @@ -2799,13 +2778,13 @@ dependencies = [ "memchr", "once_cell", "percent-encoding", - "rustls 0.23.20", + "rustls 0.23.21", "rustls-pemfile", "serde", "serde_json", "sha2", "smallvec", - "thiserror 2.0.9", + "thiserror 2.0.11", "time", "tokio", "tokio-stream", @@ -2891,7 +2870,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 2.0.9", + "thiserror 2.0.11", "time", "tracing", "uuid", @@ -2930,7 +2909,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 2.0.9", + "thiserror 2.0.11", "time", "tracing", "uuid", @@ -2993,9 +2972,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.95" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -3095,11 +3074,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.9" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" dependencies = [ - "thiserror-impl 2.0.9", + "thiserror-impl 2.0.11", ] [[package]] @@ -3115,9 +3094,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", @@ -3194,9 +3173,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -3212,9 +3191,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", @@ -3248,7 +3227,7 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ - "rustls 0.23.20", + "rustls 0.23.21", "tokio", ] @@ -3505,9 +3484,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typify" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c644dda9862f0fef3a570d8ddb3c2cfb1d5ac824a1f2ddfa7bc8f071a5ad8a" +checksum = "e03ba3643450cfd95a1aca2e1938fef63c1c1994489337998aff4ad771f21ef8" dependencies = [ "typify-impl", "typify-macro", @@ -3515,9 +3494,9 @@ dependencies = [ [[package]] name = "typify-impl" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59ab345b6c0d8ae9500b9ff334a4c7c0d316c1c628dc55726b95887eb8dbd11" +checksum = "bce48219a2f3154aaa2c56cbf027728b24a3c8fe0a47ed6399781de2b3f3eeaf" dependencies = [ "heck", "log", @@ -3529,15 +3508,15 @@ dependencies = [ "serde", "serde_json", "syn", - "thiserror 1.0.69", + "thiserror 2.0.11", "unicode-ident", ] [[package]] name = "typify-macro" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "785e2cdcef0df8160fdd762ed548a637aaec1e83704fdbc14da0df66013ee8d0" +checksum = "68b5780d745920ed73c5b7447496a9b5c42ed2681a9b70859377aec423ecf02b" dependencies = [ "proc-macro2", "quote", @@ -3620,9 +3599,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" dependencies = [ "getrandom", "serde", @@ -3678,20 +3657,21 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", @@ -3703,9 +3683,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.49" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", @@ -3716,9 +3696,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3726,9 +3706,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -3739,9 +3719,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "wasm-streams" @@ -3758,9 +3741,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", @@ -4016,9 +3999,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.22" +version = "0.6.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980" +checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index ca5b5c1..d61baf6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ name = "patagia-run" [workspace.dependencies] anyhow = "1.0.95" -clap = { version = "4.5.23", features = [ +clap = { version = "4.5.26", features = [ "derive", "deprecated", "env", @@ -35,14 +35,14 @@ dropshot = "0.15.1" futures = "0.3" http = "1.2.0" once_cell = "1.20.2" -progenitor = "0.8.0" +progenitor = "0.9" reqwest = { version = "0.12.12", features = ["json", "stream", "rustls-tls"] } schemars = "0.8.21" semver = "1.0.24" serde = { version = "1.0.217", features = ["derive"] } slog = "2.7.0" slog-async = "2.8.0" -tokio = { version = "1.42.0", features = ["full"] } +tokio = { version = "1.43.0", features = ["full"] } tracing = "0.1.41" tracing-core = "0.1.33" tracing-chrome = "0.7.2" From d5454251287f9fb0e924ec52e68316a7a6d350e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Sj=C3=B6strom?= <lars@radicore.se> Date: Wed, 8 Jan 2025 11:09:34 +0100 Subject: [PATCH 3/3] feat(hostd): varlink interfaced host controller to manage machine configuration and boot mgmt --- Cargo.lock | 260 ++++++++++++++++++----- Cargo.toml | 1 + hostd/.gitignore | 1 + hostd/Cargo.toml | 15 ++ hostd/build.rs | 6 + hostd/src/io.patagia.Hostd.varlink | 27 +++ hostd/src/io.systemd.Hostname.varlink | 32 +++ hostd/src/io_patagia_Hostd.rs | 264 +++++++++++++++++++++++ hostd/src/io_systemd_Hostname.rs | 295 ++++++++++++++++++++++++++ hostd/src/main.rs | 63 ++++++ 10 files changed, 913 insertions(+), 51 deletions(-) create mode 100644 hostd/.gitignore create mode 100644 hostd/Cargo.toml create mode 100644 hostd/build.rs create mode 100644 hostd/src/io.patagia.Hostd.varlink create mode 100644 hostd/src/io.systemd.Hostname.varlink create mode 100644 hostd/src/io_patagia_Hostd.rs create mode 100644 hostd/src/io_systemd_Hostname.rs create mode 100644 hostd/src/main.rs diff --git a/Cargo.lock b/Cargo.lock index e2d7e26..709f80b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -47,6 +47,15 @@ dependencies = [ "libc", ] +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + [[package]] name = "anstream" version = "0.6.18" @@ -122,7 +131,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -133,7 +142,7 @@ checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -211,7 +220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cfg-if", + "cfg-if 1.0.0", "libc", "miniz_oxide", "object", @@ -287,6 +296,12 @@ dependencies = [ "shlex", ] +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + [[package]] name = "cfg-if" version = "1.0.0" @@ -299,6 +314,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "chainerror" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce1bb7fb0c258a6600d699950da347a7a9dad66c3ce815769b5f11cf8fce78e" + [[package]] name = "chrono" version = "0.4.39" @@ -344,7 +365,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -430,7 +451,7 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -511,7 +532,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "dirs-sys-next", ] @@ -534,7 +555,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -605,7 +626,7 @@ dependencies = [ "semver", "serde", "serde_tokenstream", - "syn", + "syn 2.0.95", ] [[package]] @@ -629,7 +650,7 @@ version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -654,7 +675,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "home", "windows-sys 0.48.0", ] @@ -800,7 +821,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -843,13 +864,22 @@ dependencies = [ "version_check", ] +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + [[package]] name = "getrandom" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "js-sys", "libc", "wasi", @@ -958,6 +988,19 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "hostd" +version = "0.2.0" +dependencies = [ + "anyhow", + "serde", + "serde_derive", + "serde_json", + "tokio", + "varlink", + "varlink_generator", +] + [[package]] name = "hostname" version = "0.3.1" @@ -975,7 +1018,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "windows", ] @@ -1251,7 +1294,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -1467,7 +1510,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "digest", ] @@ -1477,6 +1520,15 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.17" @@ -1642,7 +1694,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 1.0.0", "foreign-types", "libc", "once_cell", @@ -1658,7 +1710,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -1804,7 +1856,7 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", @@ -1855,6 +1907,33 @@ dependencies = [ "uuid", ] +[[package]] +name = "peg" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f76678828272f177ac33b7e2ac2e3e73cc6c1cd1e3e387928aa69562fa51367" +dependencies = [ + "peg-macros", + "peg-runtime", +] + +[[package]] +name = "peg-macros" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "636d60acf97633e48d266d7415a9355d4389cea327a193f87df395d88cd2b14d" +dependencies = [ + "peg-runtime", + "proc-macro2", + "quote", +] + +[[package]] +name = "peg-runtime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9555b1514d2d99d78150d3c799d4c357a3e2c2a8062cd108e93a06d9057629c5" + [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -1887,7 +1966,7 @@ checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -1995,7 +2074,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "syn", + "syn 2.0.95", "thiserror 2.0.11", "typify", "unicode-ident", @@ -2016,7 +2095,7 @@ dependencies = [ "serde_json", "serde_tokenstream", "serde_yaml", - "syn", + "syn 2.0.95", ] [[package]] @@ -2039,7 +2118,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -2265,7 +2344,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "cfg-if", + "cfg-if 1.0.0", "getrandom", "libc", "spin", @@ -2432,7 +2511,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn", + "syn 2.0.95", ] [[package]] @@ -2503,7 +2582,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -2514,7 +2593,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -2557,7 +2636,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn", + "syn 2.0.95", ] [[package]] @@ -2591,7 +2670,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest", ] @@ -2602,7 +2681,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest", ] @@ -2804,7 +2883,7 @@ dependencies = [ "quote", "sqlx-core", "sqlx-macros-core", - "syn", + "syn 2.0.95", ] [[package]] @@ -2827,7 +2906,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn", + "syn 2.0.95", "tempfile", "tokio", "url", @@ -2972,9 +3051,20 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.96" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", @@ -2998,7 +3088,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -3034,7 +3124,7 @@ version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "fastrand", "getrandom", "once_cell", @@ -3089,7 +3179,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -3100,7 +3190,7 @@ checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -3109,7 +3199,7 @@ version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "once_cell", ] @@ -3197,7 +3287,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -3379,7 +3469,7 @@ dependencies = [ "http", "proc-macro2", "quote", - "syn", + "syn 2.0.95", "tracing", ] @@ -3403,7 +3493,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -3507,7 +3597,7 @@ dependencies = [ "semver", "serde", "serde_json", - "syn", + "syn 2.0.95", "thiserror 2.0.11", "unicode-ident", ] @@ -3525,10 +3615,21 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream", - "syn", + "syn 2.0.95", "typify-impl", ] +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset", + "tempfile", + "winapi", +] + [[package]] name = "unicode-bidi" version = "0.3.18" @@ -3556,6 +3657,22 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unix_socket" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aa2700417c405c38f5e6902d699345241c28c0b7ade4abaad71e35a87eb1564" +dependencies = [ + "cfg-if 0.1.10", + "libc", +] + [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -3613,6 +3730,47 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "varlink" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "409e275987d74665c23610c0959c133360cafd761c1a6ddb1ca6d0685c8cef5d" +dependencies = [ + "libc", + "serde", + "serde_derive", + "serde_json", + "tempfile", + "uds_windows", + "unix_socket", + "winapi", +] + +[[package]] +name = "varlink_generator" +version = "10.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d8ff746c5b65d4bfb3a50f630b85cfb6a9d59f18720126e3ebd6bc98527fa51" +dependencies = [ + "chainerror", + "getopts", + "proc-macro2", + "quote", + "syn 1.0.109", + "varlink_parser", +] + +[[package]] +name = "varlink_parser" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35fb9f3c1e8ccb33cdb6c84a4477ef3f3884ce6f4b70514ef1fbf7686eae921e" +dependencies = [ + "ansi_term", + "chainerror", + "peg", +] + [[package]] name = "vcpkg" version = "0.2.15" @@ -3661,7 +3819,7 @@ version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "once_cell", "rustversion", "wasm-bindgen-macro", @@ -3677,7 +3835,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn", + "syn 2.0.95", "wasm-bindgen-shared", ] @@ -3687,7 +3845,7 @@ version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "js-sys", "once_cell", "wasm-bindgen", @@ -3712,7 +3870,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4048,7 +4206,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", "synstructure", ] @@ -4070,7 +4228,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] @@ -4090,7 +4248,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", "synstructure", ] @@ -4119,7 +4277,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.95", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index d61baf6..b38030e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,7 @@ members = [ "agent", "controller", "instrumentation", + "hostd", "trace-request", "xtask", ] diff --git a/hostd/.gitignore b/hostd/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/hostd/.gitignore @@ -0,0 +1 @@ +/target diff --git a/hostd/Cargo.toml b/hostd/Cargo.toml new file mode 100644 index 0000000..fc9c6c3 --- /dev/null +++ b/hostd/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "hostd" +version.workspace = true +edition.workspace = true + +[dependencies] +anyhow.workspace = true +serde.workspace = true +serde_derive = "1.0.217" +serde_json = "1.0.135" +tokio.workspace = true +varlink = "11.0.1" + +[build-dependencies] +varlink_generator = "10.1.0" diff --git a/hostd/build.rs b/hostd/build.rs new file mode 100644 index 0000000..c12279a --- /dev/null +++ b/hostd/build.rs @@ -0,0 +1,6 @@ +extern crate varlink_generator; + +fn main() { + varlink_generator::cargo_build_tosource("src/io.systemd.Hostname.varlink", true); + varlink_generator::cargo_build_tosource("src/io.patagia.Hostd.varlink", true); +} diff --git a/hostd/src/io.patagia.Hostd.varlink b/hostd/src/io.patagia.Hostd.varlink new file mode 100644 index 0000000..46123a8 --- /dev/null +++ b/hostd/src/io.patagia.Hostd.varlink @@ -0,0 +1,27 @@ +interface io.patagia.Hostd + +type Label ( + key: string, + value: string +) + +type PatagiaAgentConfig ( + url: string, + extraMounts: [string]string +) + +type Machine( + machineId: string, + nodeLabels: ?[]Label, + patagiaAgent: ?PatagiaAgentConfig +) + +method Describe() -> ( + machine: Machine +) + +method Apply( + machine: Machine +) -> () + +error InvalidMachineConfig() diff --git a/hostd/src/io.systemd.Hostname.varlink b/hostd/src/io.systemd.Hostname.varlink new file mode 100644 index 0000000..be4cf01 --- /dev/null +++ b/hostd/src/io.systemd.Hostname.varlink @@ -0,0 +1,32 @@ +interface io.systemd.Hostname + +method Describe() -> ( + Hostname: string, + StaticHostname: ?string, + PrettyHostname: ?string, + DefaultHostname: ?string, + HostnameSource: string, + IconName: ?string, + Chassis: ?string, + Deployment: ?string, + Location: ?string, + KernelName: string, + KernelRelease: string, + KernelVersion: string, + OperatingSystemPrettyName: ?string, + OperatingSystemCPEName: ?string, + OperatingSystemHomeURL: ?string, + OperatingSystemSupportEnd: ?int, + OperatingSystemReleaseData: ?[]string, + MachineInformationData: ?[]string, + HardwareVendor: ?string, + HardwareModel: ?string, + HardwareSerial: ?string, + FirmwareVersion: ?string, + FirmwareVendor: ?string, + FirmwareDate: ?int, + MachineID: string, + BootID: string, + ProductUUID: ?string, + VSockCID: ?int +) diff --git a/hostd/src/io_patagia_Hostd.rs b/hostd/src/io_patagia_Hostd.rs new file mode 100644 index 0000000..a2de13d --- /dev/null +++ b/hostd/src/io_patagia_Hostd.rs @@ -0,0 +1,264 @@ +#![doc = "This file was automatically generated by the varlink rust generator"] +#![allow(non_camel_case_types)] +#![allow(non_snake_case)] +use serde_derive::{Deserialize, Serialize}; +use std::io::BufRead; +use std::sync::{Arc, RwLock}; +use varlink::{self, CallTrait}; +#[allow(dead_code)] +#[derive(Clone, PartialEq, Debug)] +#[allow(clippy::enum_variant_names)] +pub enum ErrorKind { + Varlink_Error, + VarlinkReply_Error, + InvalidMachineConfig(Option<InvalidMachineConfig_Args>), +} +impl ::std::fmt::Display for ErrorKind { + fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + match self { + ErrorKind::Varlink_Error => write!(f, "Varlink Error"), + ErrorKind::VarlinkReply_Error => write!(f, "Varlink error reply"), + ErrorKind::InvalidMachineConfig(v) => { + write!(f, "io.patagia.Hostd.InvalidMachineConfig: {:#?}", v) + } + } + } +} +pub struct Error( + pub ErrorKind, + pub Option<Box<dyn std::error::Error + 'static + Send + Sync>>, + pub Option<&'static str>, +); +impl Error { + #[allow(dead_code)] + pub fn kind(&self) -> &ErrorKind { + &self.0 + } +} +impl From<ErrorKind> for Error { + fn from(e: ErrorKind) -> Self { + Error(e, None, None) + } +} +impl std::error::Error for Error { + fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { + self.1 + .as_ref() + .map(|e| e.as_ref() as &(dyn std::error::Error + 'static)) + } +} +impl std::fmt::Display for Error { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + std::fmt::Display::fmt(&self.0, f) + } +} +impl std::fmt::Debug for Error { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + use std::error::Error as StdError; + if let Some(ref o) = self.2 { + std::fmt::Display::fmt(o, f)?; + } + std::fmt::Debug::fmt(&self.0, f)?; + if let Some(e) = self.source() { + std::fmt::Display::fmt("\nCaused by:\n", f)?; + std::fmt::Debug::fmt(&e, f)?; + } + Ok(()) + } +} +#[allow(dead_code)] +pub type Result<T> = std::result::Result<T, Error>; +impl From<varlink::Error> for Error { + fn from(e: varlink::Error) -> Self { + match e.kind() { + varlink::ErrorKind::VarlinkErrorReply(r) => Error( + ErrorKind::from(r), + Some(Box::from(e)), + Some(concat!(file!(), ":", line!(), ": ")), + ), + _ => Error( + ErrorKind::Varlink_Error, + Some(Box::from(e)), + Some(concat!(file!(), ":", line!(), ": ")), + ), + } + } +} +#[allow(dead_code)] +impl Error { + pub fn source_varlink_kind(&self) -> Option<&varlink::ErrorKind> { + use std::error::Error as StdError; + let mut s: &dyn StdError = self; + while let Some(c) = s.source() { + let k = self + .source() + .and_then(|e| e.downcast_ref::<varlink::Error>()) + .map(|e| e.kind()); + if k.is_some() { + return k; + } + s = c; + } + None + } +} +impl From<&varlink::Reply> for ErrorKind { + #[allow(unused_variables)] + fn from(e: &varlink::Reply) -> Self { + match e { + varlink::Reply { + error: Some(ref t), .. + } if t == "io.patagia.Hostd.InvalidMachineConfig" => match e { + varlink::Reply { + parameters: Some(p), + .. + } => match serde_json::from_value(p.clone()) { + Ok(v) => ErrorKind::InvalidMachineConfig(v), + Err(_) => ErrorKind::InvalidMachineConfig(None), + }, + _ => ErrorKind::InvalidMachineConfig(None), + }, + _ => ErrorKind::VarlinkReply_Error, + } + } +} +pub trait VarlinkCallError: varlink::CallTrait { + fn reply_invalid_machine_config(&mut self) -> varlink::Result<()> { + self.reply_struct(varlink::Reply::error( + "io.patagia.Hostd.InvalidMachineConfig", + None, + )) + } +} +impl<'a> VarlinkCallError for varlink::Call<'a> {} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct r#Label { + pub r#key: String, + pub r#value: String, +} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct r#Machine { + pub r#machineId: String, + pub r#nodeLabels: Option<Vec<Label>>, + pub r#patagiaAgent: Option<PatagiaAgentConfig>, +} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct r#PatagiaAgentConfig { + pub r#url: String, + pub r#extraMounts: varlink::StringHashMap<String>, +} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct InvalidMachineConfig_Args {} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct Apply_Reply {} +impl varlink::VarlinkReply for Apply_Reply {} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct Apply_Args { + pub r#machine: Machine, +} +pub trait Call_Apply: VarlinkCallError { + fn reply(&mut self) -> varlink::Result<()> { + self.reply_struct(varlink::Reply::parameters(None)) + } +} +impl<'a> Call_Apply for varlink::Call<'a> {} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct Describe_Reply { + pub r#machine: Machine, +} +impl varlink::VarlinkReply for Describe_Reply {} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct Describe_Args {} +pub trait Call_Describe: VarlinkCallError { + fn reply(&mut self, r#machine: Machine) -> varlink::Result<()> { + self.reply_struct(Describe_Reply { r#machine }.into()) + } +} +impl<'a> Call_Describe for varlink::Call<'a> {} +pub trait VarlinkInterface { + fn apply(&self, call: &mut dyn Call_Apply, r#machine: Machine) -> varlink::Result<()>; + fn describe(&self, call: &mut dyn Call_Describe) -> varlink::Result<()>; + fn call_upgraded( + &self, + _call: &mut varlink::Call, + _bufreader: &mut dyn BufRead, + ) -> varlink::Result<Vec<u8>> { + Ok(Vec::new()) + } +} +pub trait VarlinkClientInterface { + fn apply(&mut self, r#machine: Machine) -> varlink::MethodCall<Apply_Args, Apply_Reply, Error>; + fn describe(&mut self) -> varlink::MethodCall<Describe_Args, Describe_Reply, Error>; +} +#[allow(dead_code)] +pub struct VarlinkClient { + connection: Arc<RwLock<varlink::Connection>>, +} +impl VarlinkClient { + #[allow(dead_code)] + pub fn new(connection: Arc<RwLock<varlink::Connection>>) -> Self { + VarlinkClient { connection } + } +} +impl VarlinkClientInterface for VarlinkClient { + fn apply(&mut self, r#machine: Machine) -> varlink::MethodCall<Apply_Args, Apply_Reply, Error> { + varlink::MethodCall::<Apply_Args, Apply_Reply, Error>::new( + self.connection.clone(), + "io.patagia.Hostd.Apply", + Apply_Args { r#machine }, + ) + } + fn describe(&mut self) -> varlink::MethodCall<Describe_Args, Describe_Reply, Error> { + varlink::MethodCall::<Describe_Args, Describe_Reply, Error>::new( + self.connection.clone(), + "io.patagia.Hostd.Describe", + Describe_Args {}, + ) + } +} +#[allow(dead_code)] +pub struct VarlinkInterfaceProxy { + inner: Box<dyn VarlinkInterface + Send + Sync>, +} +#[allow(dead_code)] +pub fn new(inner: Box<dyn VarlinkInterface + Send + Sync>) -> VarlinkInterfaceProxy { + VarlinkInterfaceProxy { inner } +} +impl varlink::Interface for VarlinkInterfaceProxy { + fn get_description(&self) -> &'static str { + "interface io.patagia.Hostd\n\ntype Label (\n key: string,\n value: string\n)\n\ntype PatagiaAgentConfig (\n url: string,\n extraMounts: [string]string\n)\n\ntype Machine(\n machineId: string,\n nodeLabels: ?[]Label,\n patagiaAgent: ?PatagiaAgentConfig\n)\n\nmethod Describe() -> (\n machine: Machine\n)\n\nmethod Apply(\n machine: Machine\n) -> ()\n\nerror InvalidMachineConfig()\n" + } + fn get_name(&self) -> &'static str { + "io.patagia.Hostd" + } + fn call_upgraded( + &self, + call: &mut varlink::Call, + bufreader: &mut dyn BufRead, + ) -> varlink::Result<Vec<u8>> { + self.inner.call_upgraded(call, bufreader) + } + fn call(&self, call: &mut varlink::Call) -> varlink::Result<()> { + let req = call.request.unwrap(); + match req.method.as_ref() { + "io.patagia.Hostd.Apply" => { + if let Some(args) = req.parameters.clone() { + let args: Apply_Args = match serde_json::from_value(args) { + Ok(v) => v, + Err(e) => { + let es = format!("{}", e); + let _ = call.reply_invalid_parameter(es.clone()); + return Err(varlink::context!(varlink::ErrorKind::SerdeJsonDe(es))); + } + }; + self.inner + .apply(call as &mut dyn Call_Apply, args.r#machine) + } else { + call.reply_invalid_parameter("parameters".into()) + } + } + "io.patagia.Hostd.Describe" => self.inner.describe(call as &mut dyn Call_Describe), + m => call.reply_method_not_found(String::from(m)), + } + } +} diff --git a/hostd/src/io_systemd_Hostname.rs b/hostd/src/io_systemd_Hostname.rs new file mode 100644 index 0000000..e9fa185 --- /dev/null +++ b/hostd/src/io_systemd_Hostname.rs @@ -0,0 +1,295 @@ +#![doc = "This file was automatically generated by the varlink rust generator"] +#![allow(non_camel_case_types)] +#![allow(non_snake_case)] +use serde_derive::{Deserialize, Serialize}; +use std::io::BufRead; +use std::sync::{Arc, RwLock}; +use varlink::{self, CallTrait}; +#[allow(dead_code)] +#[derive(Clone, PartialEq, Debug)] +#[allow(clippy::enum_variant_names)] +pub enum ErrorKind { + Varlink_Error, + VarlinkReply_Error, +} +impl ::std::fmt::Display for ErrorKind { + fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + match self { + ErrorKind::Varlink_Error => write!(f, "Varlink Error"), + ErrorKind::VarlinkReply_Error => write!(f, "Varlink error reply"), + } + } +} +pub struct Error( + pub ErrorKind, + pub Option<Box<dyn std::error::Error + 'static + Send + Sync>>, + pub Option<&'static str>, +); +impl Error { + #[allow(dead_code)] + pub fn kind(&self) -> &ErrorKind { + &self.0 + } +} +impl From<ErrorKind> for Error { + fn from(e: ErrorKind) -> Self { + Error(e, None, None) + } +} +impl std::error::Error for Error { + fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { + self.1 + .as_ref() + .map(|e| e.as_ref() as &(dyn std::error::Error + 'static)) + } +} +impl std::fmt::Display for Error { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + std::fmt::Display::fmt(&self.0, f) + } +} +impl std::fmt::Debug for Error { + fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + use std::error::Error as StdError; + if let Some(ref o) = self.2 { + std::fmt::Display::fmt(o, f)?; + } + std::fmt::Debug::fmt(&self.0, f)?; + if let Some(e) = self.source() { + std::fmt::Display::fmt("\nCaused by:\n", f)?; + std::fmt::Debug::fmt(&e, f)?; + } + Ok(()) + } +} +#[allow(dead_code)] +pub type Result<T> = std::result::Result<T, Error>; +impl From<varlink::Error> for Error { + fn from(e: varlink::Error) -> Self { + match e.kind() { + varlink::ErrorKind::VarlinkErrorReply(r) => Error( + ErrorKind::from(r), + Some(Box::from(e)), + Some(concat!(file!(), ":", line!(), ": ")), + ), + _ => Error( + ErrorKind::Varlink_Error, + Some(Box::from(e)), + Some(concat!(file!(), ":", line!(), ": ")), + ), + } + } +} +#[allow(dead_code)] +impl Error { + pub fn source_varlink_kind(&self) -> Option<&varlink::ErrorKind> { + use std::error::Error as StdError; + let mut s: &dyn StdError = self; + while let Some(c) = s.source() { + let k = self + .source() + .and_then(|e| e.downcast_ref::<varlink::Error>()) + .map(|e| e.kind()); + if k.is_some() { + return k; + } + s = c; + } + None + } +} +impl From<&varlink::Reply> for ErrorKind { + #[allow(unused_variables)] + fn from(e: &varlink::Reply) -> Self { + match e { + _ => ErrorKind::VarlinkReply_Error, + } + } +} +pub trait VarlinkCallError: varlink::CallTrait {} +impl<'a> VarlinkCallError for varlink::Call<'a> {} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct Describe_Reply { + pub r#Hostname: String, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#StaticHostname: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#PrettyHostname: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#DefaultHostname: Option<String>, + pub r#HostnameSource: String, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#IconName: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#Chassis: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#Deployment: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#Location: Option<String>, + pub r#KernelName: String, + pub r#KernelRelease: String, + pub r#KernelVersion: String, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#OperatingSystemPrettyName: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#OperatingSystemCPEName: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#OperatingSystemHomeURL: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#OperatingSystemSupportEnd: Option<i64>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#OperatingSystemReleaseData: Option<Vec<String>>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#MachineInformationData: Option<Vec<String>>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#HardwareVendor: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#HardwareModel: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#HardwareSerial: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#FirmwareVersion: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#FirmwareVendor: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#FirmwareDate: Option<i64>, + pub r#MachineID: String, + pub r#BootID: String, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#ProductUUID: Option<String>, + #[serde(skip_serializing_if = "Option::is_none")] + pub r#VSockCID: Option<i64>, +} +impl varlink::VarlinkReply for Describe_Reply {} +#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)] +pub struct Describe_Args {} +pub trait Call_Describe: VarlinkCallError { + fn reply( + &mut self, + r#Hostname: String, + r#StaticHostname: Option<String>, + r#PrettyHostname: Option<String>, + r#DefaultHostname: Option<String>, + r#HostnameSource: String, + r#IconName: Option<String>, + r#Chassis: Option<String>, + r#Deployment: Option<String>, + r#Location: Option<String>, + r#KernelName: String, + r#KernelRelease: String, + r#KernelVersion: String, + r#OperatingSystemPrettyName: Option<String>, + r#OperatingSystemCPEName: Option<String>, + r#OperatingSystemHomeURL: Option<String>, + r#OperatingSystemSupportEnd: Option<i64>, + r#OperatingSystemReleaseData: Option<Vec<String>>, + r#MachineInformationData: Option<Vec<String>>, + r#HardwareVendor: Option<String>, + r#HardwareModel: Option<String>, + r#HardwareSerial: Option<String>, + r#FirmwareVersion: Option<String>, + r#FirmwareVendor: Option<String>, + r#FirmwareDate: Option<i64>, + r#MachineID: String, + r#BootID: String, + r#ProductUUID: Option<String>, + r#VSockCID: Option<i64>, + ) -> varlink::Result<()> { + self.reply_struct( + Describe_Reply { + r#Hostname, + r#StaticHostname, + r#PrettyHostname, + r#DefaultHostname, + r#HostnameSource, + r#IconName, + r#Chassis, + r#Deployment, + r#Location, + r#KernelName, + r#KernelRelease, + r#KernelVersion, + r#OperatingSystemPrettyName, + r#OperatingSystemCPEName, + r#OperatingSystemHomeURL, + r#OperatingSystemSupportEnd, + r#OperatingSystemReleaseData, + r#MachineInformationData, + r#HardwareVendor, + r#HardwareModel, + r#HardwareSerial, + r#FirmwareVersion, + r#FirmwareVendor, + r#FirmwareDate, + r#MachineID, + r#BootID, + r#ProductUUID, + r#VSockCID, + } + .into(), + ) + } +} +impl<'a> Call_Describe for varlink::Call<'a> {} +pub trait VarlinkInterface { + fn describe(&self, call: &mut dyn Call_Describe) -> varlink::Result<()>; + fn call_upgraded( + &self, + _call: &mut varlink::Call, + _bufreader: &mut dyn BufRead, + ) -> varlink::Result<Vec<u8>> { + Ok(Vec::new()) + } +} +pub trait VarlinkClientInterface { + fn describe(&mut self) -> varlink::MethodCall<Describe_Args, Describe_Reply, Error>; +} +#[allow(dead_code)] +pub struct VarlinkClient { + connection: Arc<RwLock<varlink::Connection>>, +} +impl VarlinkClient { + #[allow(dead_code)] + pub fn new(connection: Arc<RwLock<varlink::Connection>>) -> Self { + VarlinkClient { connection } + } +} +impl VarlinkClientInterface for VarlinkClient { + fn describe(&mut self) -> varlink::MethodCall<Describe_Args, Describe_Reply, Error> { + varlink::MethodCall::<Describe_Args, Describe_Reply, Error>::new( + self.connection.clone(), + "io.systemd.Hostname.Describe", + Describe_Args {}, + ) + } +} +#[allow(dead_code)] +pub struct VarlinkInterfaceProxy { + inner: Box<dyn VarlinkInterface + Send + Sync>, +} +#[allow(dead_code)] +pub fn new(inner: Box<dyn VarlinkInterface + Send + Sync>) -> VarlinkInterfaceProxy { + VarlinkInterfaceProxy { inner } +} +impl varlink::Interface for VarlinkInterfaceProxy { + fn get_description(&self) -> &'static str { + "interface io.systemd.Hostname\n\nmethod Describe() -> (\n\tHostname: string,\n\tStaticHostname: ?string,\n\tPrettyHostname: ?string,\n\tDefaultHostname: ?string,\n\tHostnameSource: string,\n\tIconName: ?string,\n\tChassis: ?string,\n\tDeployment: ?string,\n\tLocation: ?string,\n\tKernelName: string,\n\tKernelRelease: string,\n\tKernelVersion: string,\n\tOperatingSystemPrettyName: ?string,\n\tOperatingSystemCPEName: ?string,\n\tOperatingSystemHomeURL: ?string,\n\tOperatingSystemSupportEnd: ?int,\n\tOperatingSystemReleaseData: ?[]string,\n\tMachineInformationData: ?[]string,\n\tHardwareVendor: ?string,\n\tHardwareModel: ?string,\n\tHardwareSerial: ?string,\n\tFirmwareVersion: ?string,\n\tFirmwareVendor: ?string,\n\tFirmwareDate: ?int,\n\tMachineID: string,\n\tBootID: string,\n\tProductUUID: ?string,\n\tVSockCID: ?int\n)\n" + } + fn get_name(&self) -> &'static str { + "io.systemd.Hostname" + } + fn call_upgraded( + &self, + call: &mut varlink::Call, + bufreader: &mut dyn BufRead, + ) -> varlink::Result<Vec<u8>> { + self.inner.call_upgraded(call, bufreader) + } + fn call(&self, call: &mut varlink::Call) -> varlink::Result<()> { + let req = call.request.unwrap(); + match req.method.as_ref() { + "io.systemd.Hostname.Describe" => self.inner.describe(call as &mut dyn Call_Describe), + m => call.reply_method_not_found(String::from(m)), + } + } +} diff --git a/hostd/src/main.rs b/hostd/src/main.rs new file mode 100644 index 0000000..01ff4d2 --- /dev/null +++ b/hostd/src/main.rs @@ -0,0 +1,63 @@ +use std::{collections::HashMap, process::exit}; + +use crate::io_patagia_Hostd::{ + Call_Apply, Call_Describe, Label, Machine, PatagiaAgentConfig, VarlinkInterface, +}; + +mod io_patagia_Hostd; + +const LISTEN_ADDRESS: &str = "unix:/tmp/io.patagia.Hostd"; + +struct Hostd; + +impl VarlinkInterface for Hostd { + fn apply(&self, call: &mut dyn Call_Apply, machine: Machine) -> varlink::Result<()> { + println!("Machine: {:#?}", machine); + return call.reply(); + } + + fn describe(&self, call: &mut dyn Call_Describe) -> varlink::Result<()> { + let machine = Machine { + machineId: "1".to_string(), + nodeLabels: Option::from(vec![Label { + key: "key".to_string(), + value: "value".to_string(), + }]), + patagiaAgent: Option::from(PatagiaAgentConfig { + url: "https://cdn.patagia.dev/patagia-agent/stable".to_string(), + extraMounts: HashMap::new(), + }), + }; + return call.reply(machine); + } +} + +fn main() { + let hostd = Hostd; + let hostd_interface = io_patagia_Hostd::new(Box::new(hostd)); + + let svc = varlink::VarlinkService::new( + "io.patagia.Hostd", + "Host controller for patagia", + "0.1", + "https://patagia.dev", + vec![Box::new(hostd_interface)], + ); + let ret: Result<(), varlink::Error> = varlink::listen( + svc, + LISTEN_ADDRESS, + &varlink::ListenConfig { + // Listen forever (0 = forever) + idle_timeout: 0, + ..Default::default() + }, + ); + + exit(match ret { + Ok(_) => 0, + Err(e) => { + println!("Error: {}", e); + 1 + } + }); +}