diff --git a/CHANGELOG.md b/CHANGELOG.md index 76d0b100..4d0cf35c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,11 @@ ### Changed -- Replace stackable-operator `initialize_logging` with stackable-telemetry `Tracing` ([#610]). - - BREAKING: The file log directory was set by `SUPERSET_OPERATOR_LOG_DIRECTORY`, and is now set by `ROLLING_LOGS` - (or via `--rolling-logs `). +- BREAKING: Replace stackable-operator `initialize_logging` with stackable-telemetry `Tracing` ([#610], [#617]). + - The console log level was set by `SUPERSET_OPERATOR_LOG`, and is now set by `CONSOLE_LOG`. + - The file log level was set by `SUPERSET_OPERATOR_LOG`, and is now set by `FILE_LOG`. + - The file log directory was set by `SUPERSET_OPERATOR_LOG_DIRECTORY`, and is now set + by `ROLLING_LOGS_DIR` (or via `--rolling-logs `). - Replace stackable-operator `print_startup_string` with `tracing::info!` with fields. - BREAKING: Inject the vector aggregator address into the vector config using the env var `VECTOR_AGGREGATOR_ADDRESS` instead of having the operator write it to the vector config ([#609]). @@ -19,6 +21,7 @@ [#609]: https://github.com/stackabletech/superset-operator/pull/609 [#610]: https://github.com/stackabletech/superset-operator/pull/610 [#615]: https://github.com/stackabletech/superset-operator/pull/615 +[#617]: https://github.com/stackabletech/superset-operator/pull/617 ## [25.3.0] - 2025-03-21 diff --git a/Cargo.lock b/Cargo.lock index f7c4ddd6..a3b3cbd4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,7 +24,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy 0.7.35", @@ -276,9 +276,9 @@ dependencies = [ [[package]] name = "backon" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970d91570c01a8a5959b36ad7dd1c30642df24b6b3068710066f6809f7033bb7" +checksum = "fd0b50b1b78dbadd44ab18b3c794e496f3a139abb9fbc27d9c94c4eebbb96496" dependencies = [ "fastrand", "gloo-timers", @@ -366,9 +366,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.2.16" +version = "1.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c" +checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c" dependencies = [ "jobserver", "libc", @@ -396,9 +396,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.32" +version = "4.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83" +checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944" dependencies = [ "clap_builder", "clap_derive", @@ -406,9 +406,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.32" +version = "4.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8" +checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9" dependencies = [ "anstream", "anstyle", @@ -524,9 +524,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.14" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] @@ -549,9 +549,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ "darling_core", "darling_macro", @@ -559,9 +559,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" dependencies = [ "fnv", "ident_case", @@ -573,9 +573,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.10" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", @@ -584,9 +584,9 @@ dependencies = [ [[package]] name = "delegate" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297806318ef30ad066b15792a8372858020ae3ca2e414ee6c2133b1eb9e9e945" +checksum = "b9b6483c2bbed26f97861cf57651d4f2b731964a28cd2257f934a4b452480d21" dependencies = [ "proc-macro2", "quote", @@ -724,9 +724,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" dependencies = [ "event-listener", "pin-project-lite", @@ -900,7 +900,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", ] [[package]] @@ -952,7 +964,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.8.0", + "indexmap 2.9.0", "slab", "tokio", "tokio-util", @@ -1017,13 +1029,13 @@ dependencies = [ [[package]] name = "hostname" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" dependencies = [ "cfg-if", "libc", - "windows", + "windows-link", ] [[package]] @@ -1147,9 +1159,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" +checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2" dependencies = [ "bytes", "futures-channel", @@ -1157,6 +1169,7 @@ dependencies = [ "http", "http-body", "hyper", + "libc", "pin-project-lite", "socket2", "tokio", @@ -1166,14 +1179,15 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.61" +version = "0.1.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", + "log", "wasm-bindgen", "windows-core", ] @@ -1228,9 +1242,9 @@ dependencies = [ [[package]] name = "icu_locid_transform_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" +checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" [[package]] name = "icu_normalizer" @@ -1252,9 +1266,9 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" +checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" [[package]] name = "icu_properties" @@ -1273,9 +1287,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" +checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" [[package]] name = "icu_provider" @@ -1344,9 +1358,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -1398,10 +1412,11 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" dependencies = [ + "getrandom 0.3.2", "libc", ] @@ -1467,7 +1482,7 @@ dependencies = [ [[package]] name = "k8s-version" version = "0.1.2" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.1#6c4b022dcdaec09a0c0ecb420a41bb180d4edbf8" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.1#0f9b6f9669051e9c4f29e6e882acf3eff3ac3f14" dependencies = [ "darling", "regex", @@ -1638,9 +1653,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.26" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "matchers" @@ -1677,9 +1692,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" dependencies = [ "adler2", ] @@ -1691,7 +1706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -1731,9 +1746,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.1" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "openssl-probe" @@ -1897,9 +1912,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" +checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6" dependencies = [ "memchr", "thiserror 2.0.12", @@ -1908,9 +1923,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e" +checksum = "d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5" dependencies = [ "pest", "pest_generator", @@ -1918,9 +1933,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" +checksum = "db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841" dependencies = [ "pest", "pest_meta", @@ -1931,9 +1946,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.7.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" +checksum = "7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0" dependencies = [ "once_cell", "pest", @@ -2059,6 +2074,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + [[package]] name = "rand" version = "0.8.5" @@ -2086,14 +2107,14 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] name = "redox_syscall" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1" +checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" dependencies = [ "bitflags", ] @@ -2193,7 +2214,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", "untrusted", "windows-sys 0.52.0", @@ -2301,9 +2322,9 @@ checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" [[package]] name = "rustls-webpki" -version = "0.103.0" +version = "0.103.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa4eeac2588ffff23e9d7a7e9b3f971c5fb5b7ebc9452745e0c232c64f83b2f" +checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" dependencies = [ "ring", "rustls-pki-types", @@ -2494,7 +2515,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.8.0", + "indexmap 2.9.0", "itoa", "ryu", "serde", @@ -2558,9 +2579,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd" +checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" [[package]] name = "snafu" @@ -2606,9 +2627,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" +checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2622,8 +2643,8 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stackable-operator" -version = "0.90.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.90.0#ea063b4595caa20c82d37c595487c76476c9ab10" +version = "0.91.1" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.1#0f9b6f9669051e9c4f29e6e882acf3eff3ac3f14" dependencies = [ "chrono", "clap", @@ -2633,7 +2654,7 @@ dependencies = [ "educe", "either", "futures 0.3.31", - "indexmap 2.8.0", + "indexmap 2.9.0", "json-patch", "k8s-openapi", "kube", @@ -2647,6 +2668,8 @@ dependencies = [ "snafu 0.8.5", "stackable-operator-derive", "stackable-shared", + "stackable-telemetry", + "stackable-versioned", "strum", "tokio", "tracing", @@ -2658,7 +2681,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.90.0#ea063b4595caa20c82d37c595487c76476c9ab10" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.1#0f9b6f9669051e9c4f29e6e882acf3eff3ac3f14" dependencies = [ "darling", "proc-macro2", @@ -2669,7 +2692,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.90.0#ea063b4595caa20c82d37c595487c76476c9ab10" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.1#0f9b6f9669051e9c4f29e6e882acf3eff3ac3f14" dependencies = [ "kube", "semver", @@ -2696,8 +2719,6 @@ dependencies = [ "serde_yaml", "snafu 0.8.5", "stackable-operator", - "stackable-telemetry", - "stackable-versioned", "strum", "tokio", "tracing", @@ -2705,10 +2726,11 @@ dependencies = [ [[package]] name = "stackable-telemetry" -version = "0.4.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-telemetry-0.4.0#52bdee5749e217005025d07f33c7020931c31d91" +version = "0.5.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.1#0f9b6f9669051e9c4f29e6e882acf3eff3ac3f14" dependencies = [ "axum 0.8.3", + "clap", "futures-util", "opentelemetry", "opentelemetry-appender-tracing", @@ -2716,6 +2738,7 @@ dependencies = [ "opentelemetry_sdk", "pin-project", "snafu 0.8.5", + "strum", "tokio", "tower 0.5.2", "tracing", @@ -2727,7 +2750,7 @@ dependencies = [ [[package]] name = "stackable-versioned" version = "0.7.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.1#6c4b022dcdaec09a0c0ecb420a41bb180d4edbf8" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.1#0f9b6f9669051e9c4f29e6e882acf3eff3ac3f14" dependencies = [ "stackable-versioned-macros", ] @@ -2735,7 +2758,7 @@ dependencies = [ [[package]] name = "stackable-versioned-macros" version = "0.7.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.1#6c4b022dcdaec09a0c0ecb420a41bb180d4edbf8" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.1#0f9b6f9669051e9c4f29e6e882acf3eff3ac3f14" dependencies = [ "convert_case", "darling", @@ -2876,9 +2899,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.40" +version = "0.3.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" dependencies = [ "deranged", "itoa", @@ -2897,9 +2920,9 @@ checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" [[package]] name = "time-macros" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" dependencies = [ "num-conv", "time-core", @@ -2917,9 +2940,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.44.1" +version = "1.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a" +checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" dependencies = [ "backtrace", "bytes", @@ -2991,7 +3014,7 @@ version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ - "indexmap 2.8.0", + "indexmap 2.9.0", "toml_datetime", "winnow", ] @@ -3310,6 +3333,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasm-bindgen" version = "0.2.100" @@ -3424,22 +3456,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.52.0" +name = "windows-core" +version = "0.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" dependencies = [ - "windows-core", - "windows-targets 0.52.6", + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings 0.4.0", ] [[package]] -name = "windows-core" -version = "0.52.0" +name = "windows-implement" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" dependencies = [ - "windows-targets 0.52.6", + "proc-macro2", + "quote", + "syn 2.0.100", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", ] [[package]] @@ -3455,7 +3503,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" dependencies = [ "windows-result", - "windows-strings", + "windows-strings 0.3.1", "windows-targets 0.53.0", ] @@ -3477,6 +3525,15 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-strings" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-sys" version = "0.52.0" @@ -3625,13 +3682,22 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36" +checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" dependencies = [ "memchr", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags", +] + [[package]] name = "write16" version = "1.0.0" @@ -3646,9 +3712,9 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "xml-rs" -version = "0.8.25" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b940ebc25896e71dd073bad2dbaa2abfe97b0a391415e22ad1326d9c54e3c4" +checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda" [[package]] name = "yoke" diff --git a/Cargo.nix b/Cargo.nix index 30dd1cf7..2403d49c 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -149,7 +149,7 @@ rec { } { name = "getrandom"; - packageId = "getrandom"; + packageId = "getrandom 0.2.15"; optional = true; } { @@ -948,9 +948,9 @@ rec { }; "backon" = rec { crateName = "backon"; - version = "1.4.1"; + version = "1.5.0"; edition = "2021"; - sha256 = "1drv0gvhjs3g0q88f1mknqjdyhh6qg8pvb9nkfasba011ibr23cp"; + sha256 = "15k4p6xyxi4lkiyw5yxrmcws3wwnwjacgcqqmd2dvfldnyqm02zx"; dependencies = [ { name = "fastrand"; @@ -1221,9 +1221,9 @@ rec { }; "cc" = rec { crateName = "cc"; - version = "1.2.16"; + version = "1.2.18"; edition = "2018"; - sha256 = "131bhgafc1i86vvjipkj0kwzz0hlpwrkl8mdbmzyq2g69calqwdy"; + sha256 = "0p6d2pfyrjgqpf2w399wzj4hmyffj6g0gyzg3pdy6xl3gmhlcl2j"; authors = [ "Alex Crichton " ]; @@ -1329,10 +1329,10 @@ rec { }; "clap" = rec { crateName = "clap"; - version = "4.5.32"; + version = "4.5.35"; edition = "2021"; crateBin = []; - sha256 = "10vg2fbcsy0dwxdqpdqihxl8b935310lax6dc29d221nijpg7230"; + sha256 = "0i1rnz7mwbhs5qf10r6vmrkplkzm3477khkwz189rha49f9qdanq"; dependencies = [ { name = "clap_builder"; @@ -1371,9 +1371,9 @@ rec { }; "clap_builder" = rec { crateName = "clap_builder"; - version = "4.5.32"; + version = "4.5.35"; edition = "2021"; - sha256 = "1j5cdwdry9anb8ljzqymb15byghz8jcpzafshbxysmb1cxzyz9r2"; + sha256 = "1nczcw6cc49ap99nn3v3n0vrv7j74zin34palq6ji586vnrdn514"; dependencies = [ { name = "anstream"; @@ -1697,9 +1697,9 @@ rec { }; "crossbeam-channel" = rec { crateName = "crossbeam-channel"; - version = "0.5.14"; + version = "0.5.15"; edition = "2021"; - sha256 = "0wa41qybq5w8s70anb472myh4fid4aw6v65vws6wn528w9l6vfh6"; + sha256 = "1cicd9ins0fkpfgvz9vhz3m9rpkh6n8d3437c3wnfsdkd3wgif42"; libName = "crossbeam_channel"; dependencies = [ { @@ -1754,9 +1754,9 @@ rec { }; "darling" = rec { crateName = "darling"; - version = "0.20.10"; + version = "0.20.11"; edition = "2021"; - sha256 = "1299h2z88qn71mizhh05j26yr3ik0wnqmw11ijds89l8i9nbhqvg"; + sha256 = "1vmlphlrlw4f50z16p4bc9p5qwdni1ba95qmxfrrmzs6dh8lczzw"; authors = [ "Ted Driggs " ]; @@ -1779,9 +1779,9 @@ rec { }; "darling_core" = rec { crateName = "darling_core"; - version = "0.20.10"; + version = "0.20.11"; edition = "2021"; - sha256 = "1rgr9nci61ahnim93yh3xy6fkfayh7sk4447hahawah3m1hkh4wm"; + sha256 = "0bj1af6xl4ablnqbgn827m43b8fiicgv180749f5cphqdmcvj00d"; authors = [ "Ted Driggs " ]; @@ -1821,9 +1821,9 @@ rec { }; "darling_macro" = rec { crateName = "darling_macro"; - version = "0.20.10"; + version = "0.20.11"; edition = "2021"; - sha256 = "01kq3ibbn47czijj39h3vxyw0c2ksd0jvc097smcrk7n2jjs4dnk"; + sha256 = "1bbfbc2px6sj1pqqq97bgqn6c8xdnb2fmz66f7f40nrqrcybjd7w"; procMacro = true; authors = [ "Ted Driggs " @@ -1846,9 +1846,9 @@ rec { }; "delegate" = rec { crateName = "delegate"; - version = "0.13.2"; + version = "0.13.3"; edition = "2018"; - sha256 = "0ig9x6wiwfqkqbk4wh9frbihl0jq50vsi4jpn5kd02pkiqqhcy19"; + sha256 = "088d919b991lz5bj5k989ab33dzjsi8pdx8whsbnzlmy5cy4idmr"; procMacro = true; authors = [ "Godfrey Chan " @@ -2211,9 +2211,9 @@ rec { }; "event-listener-strategy" = rec { crateName = "event-listener-strategy"; - version = "0.5.3"; + version = "0.5.4"; edition = "2021"; - sha256 = "1ch5gf6knllyq12jkb5zdfag573dh44307q4pwwi2g37sc6lwgiw"; + sha256 = "14rv18av8s7n8yixg38bxp5vg2qs394rl1w052by5npzmbgz7scb"; libName = "event_listener_strategy"; authors = [ "John Nunley " @@ -2232,6 +2232,7 @@ rec { features = { "default" = [ "std" ]; "loom" = [ "event-listener/loom" ]; + "portable-atomic" = [ "event-listener/portable-atomic" ]; "std" = [ "event-listener/std" ]; }; resolvedDefaultFeatures = [ "default" "std" ]; @@ -2724,7 +2725,7 @@ rec { }; resolvedDefaultFeatures = [ "more_lengths" ]; }; - "getrandom" = rec { + "getrandom 0.2.15" = rec { crateName = "getrandom"; version = "0.2.15"; edition = "2018"; @@ -2745,7 +2746,7 @@ rec { } { name = "wasi"; - packageId = "wasi"; + packageId = "wasi 0.11.0+wasi-snapshot-preview1"; usesDefaultFeatures = false; target = { target, features }: ("wasi" == target."os" or null); } @@ -2760,6 +2761,86 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; + "getrandom 0.3.2" = rec { + crateName = "getrandom"; + version = "0.3.2"; + edition = "2021"; + sha256 = "1w2mlixa1989v7czr68iji7h67yra2pbg3s480wsqjza1r2sizkk"; + authors = [ + "The Rand Project Developers" + ]; + dependencies = [ + { + name = "cfg-if"; + packageId = "cfg-if"; + } + { + name = "libc"; + packageId = "libc"; + usesDefaultFeatures = false; + target = { target, features }: ((("linux" == target."os" or null) || ("android" == target."os" or null)) && (!((("linux" == target."os" or null) && ("" == target."env" or null)) || ("custom" == target."getrandom_backend" or null) || ("linux_raw" == target."getrandom_backend" or null) || ("rdrand" == target."getrandom_backend" or null) || ("rndr" == target."getrandom_backend" or null)))); + } + { + name = "libc"; + packageId = "libc"; + usesDefaultFeatures = false; + target = { target, features }: (("dragonfly" == target."os" or null) || ("freebsd" == target."os" or null) || ("hurd" == target."os" or null) || ("illumos" == target."os" or null) || ("cygwin" == target."os" or null) || (("horizon" == target."os" or null) && ("arm" == target."arch" or null))); + } + { + name = "libc"; + packageId = "libc"; + usesDefaultFeatures = false; + target = { target, features }: (("haiku" == target."os" or null) || ("redox" == target."os" or null) || ("nto" == target."os" or null) || ("aix" == target."os" or null)); + } + { + name = "libc"; + packageId = "libc"; + usesDefaultFeatures = false; + target = { target, features }: (("ios" == target."os" or null) || ("visionos" == target."os" or null) || ("watchos" == target."os" or null) || ("tvos" == target."os" or null)); + } + { + name = "libc"; + packageId = "libc"; + usesDefaultFeatures = false; + target = { target, features }: (("macos" == target."os" or null) || ("openbsd" == target."os" or null) || ("vita" == target."os" or null) || ("emscripten" == target."os" or null)); + } + { + name = "libc"; + packageId = "libc"; + usesDefaultFeatures = false; + target = { target, features }: ("netbsd" == target."os" or null); + } + { + name = "libc"; + packageId = "libc"; + usesDefaultFeatures = false; + target = { target, features }: ("solaris" == target."os" or null); + } + { + name = "libc"; + packageId = "libc"; + usesDefaultFeatures = false; + target = { target, features }: ("vxworks" == target."os" or null); + } + { + name = "r-efi"; + packageId = "r-efi"; + usesDefaultFeatures = false; + target = { target, features }: (("uefi" == target."os" or null) && ("efi_rng" == target."getrandom_backend" or null)); + } + { + name = "wasi"; + packageId = "wasi 0.14.2+wasi-0.2.4"; + usesDefaultFeatures = false; + target = { target, features }: (("wasm32" == target."arch" or null) && ("wasi" == target."os" or null) && ("p2" == target."env" or null)); + } + ]; + features = { + "rustc-dep-of-std" = [ "dep:compiler_builtins" "dep:core" ]; + "wasm_js" = [ "dep:wasm-bindgen" "dep:js-sys" ]; + }; + resolvedDefaultFeatures = [ "std" ]; + }; "gimli" = rec { crateName = "gimli"; version = "0.31.1"; @@ -2903,7 +2984,7 @@ rec { } { name = "indexmap"; - packageId = "indexmap 2.8.0"; + packageId = "indexmap 2.9.0"; features = [ "std" ]; } { @@ -3088,13 +3169,9 @@ rec { }; "hostname" = rec { crateName = "hostname"; - version = "0.4.0"; + version = "0.4.1"; edition = "2021"; - sha256 = "1fpjr3vgi64ly1ci8phdqjbha4k22c65c94a9drriiqnmk4cgizr"; - authors = [ - "fengcen " - "svartalf " - ]; + sha256 = "0rbxryl68bwv8hkjdjd8f37kdb10fncgsqrqksv64qy7s4y20vx5"; dependencies = [ { name = "cfg-if"; @@ -3106,10 +3183,9 @@ rec { target = { target, features }: ((target."unix" or false) || ("redox" == target."os" or null)); } { - name = "windows"; - packageId = "windows"; + name = "windows-link"; + packageId = "windows-link"; target = { target, features }: ("windows" == target."os" or null); - features = [ "Win32_Foundation" "Win32_System_SystemInformation" ]; } ]; features = { @@ -3587,9 +3663,9 @@ rec { }; "hyper-util" = rec { crateName = "hyper-util"; - version = "0.1.10"; + version = "0.1.11"; edition = "2021"; - sha256 = "1d1iwrkysjhq63pg54zk3vfby1j7zmxzm9zzyfr4lwvp0szcybfz"; + sha256 = "1wj3svb1r6yv6kgk5fsz6wwajmngc4zxcw4wxpwlmpbgl8rvqys9"; libName = "hyper_util"; authors = [ "Sean McArthur " @@ -3621,6 +3697,11 @@ rec { name = "hyper"; packageId = "hyper"; } + { + name = "libc"; + packageId = "libc"; + optional = true; + } { name = "pin-project-lite"; packageId = "pin-project-lite"; @@ -3668,8 +3749,8 @@ rec { ]; features = { "client" = [ "hyper/client" "dep:tracing" "dep:futures-channel" "dep:tower-service" ]; - "client-legacy" = [ "client" "dep:socket2" "tokio/sync" ]; - "full" = [ "client" "client-legacy" "server" "server-auto" "server-graceful" "service" "http1" "http2" "tokio" ]; + "client-legacy" = [ "client" "dep:socket2" "tokio/sync" "dep:libc" ]; + "full" = [ "client" "client-legacy" "server" "server-auto" "server-graceful" "service" "http1" "http2" "tokio" "tracing" ]; "http1" = [ "hyper/http1" ]; "http2" = [ "hyper/http2" ]; "server" = [ "hyper/server" ]; @@ -3677,14 +3758,15 @@ rec { "server-graceful" = [ "server" "tokio/sync" "futures-util/alloc" ]; "service" = [ "dep:tower-service" ]; "tokio" = [ "dep:tokio" "tokio/net" "tokio/rt" "tokio/time" ]; + "tracing" = [ "dep:tracing" ]; }; resolvedDefaultFeatures = [ "client" "client-legacy" "default" "http1" "http2" "server" "server-auto" "service" "tokio" ]; }; "iana-time-zone" = rec { crateName = "iana-time-zone"; - version = "0.1.61"; - edition = "2018"; - sha256 = "085jjsls330yj1fnwykfzmb2f10zp6l7w4fhq81ng81574ghhpi3"; + version = "0.1.63"; + edition = "2021"; + sha256 = "1n171f5lbc7bryzmp1h30zw86zbvl5480aq02z92lcdwvvjikjdh"; libName = "iana_time_zone"; authors = [ "Andrew Straw " @@ -3700,7 +3782,7 @@ rec { { name = "core-foundation-sys"; packageId = "core-foundation-sys"; - target = { target, features }: (("macos" == target."os" or null) || ("ios" == target."os" or null)); + target = { target, features }: ("apple" == target."vendor" or null); } { name = "iana-time-zone-haiku"; @@ -3712,6 +3794,11 @@ rec { packageId = "js-sys"; target = { target, features }: (("wasm32" == target."arch" or null) && ("unknown" == target."os" or null)); } + { + name = "log"; + packageId = "log"; + target = { target, features }: (("wasm32" == target."arch" or null) && ("unknown" == target."os" or null)); + } { name = "wasm-bindgen"; packageId = "wasm-bindgen"; @@ -3884,9 +3971,9 @@ rec { }; "icu_locid_transform_data" = rec { crateName = "icu_locid_transform_data"; - version = "1.5.0"; + version = "1.5.1"; edition = "2021"; - sha256 = "0vkgjixm0wzp2n3v5mw4j89ly05bg3lx96jpdggbwlpqi0rzzj7x"; + sha256 = "07gignya9gzynnyds88bmra4blq9jxzgrcss43vzk2q9h7byc5bm"; authors = [ "The ICU4X Project Developers" ]; @@ -3974,9 +4061,9 @@ rec { }; "icu_normalizer_data" = rec { crateName = "icu_normalizer_data"; - version = "1.5.0"; + version = "1.5.1"; edition = "2021"; - sha256 = "05lmk0zf0q7nzjnj5kbmsigj3qgr0rwicnn5pqi9n7krmbvzpjpq"; + sha256 = "1dqcm86spcqcs4jnra81yqq3g5bpw6bvf5iz621spj5x52137s65"; authors = [ "The ICU4X Project Developers" ]; @@ -4045,9 +4132,9 @@ rec { }; "icu_properties_data" = rec { crateName = "icu_properties_data"; - version = "1.5.0"; + version = "1.5.1"; edition = "2021"; - sha256 = "0scms7pd5a7yxx9hfl167f5qdf44as6r3bd8myhlngnxqgxyza37"; + sha256 = "1qm5vf17nyiwb87s3g9x9fsj32gkv4a7q7d2sblawx9vfncqgyw5"; authors = [ "The ICU4X Project Developers" ]; @@ -4241,11 +4328,11 @@ rec { "serde-1" = [ "serde" ]; }; }; - "indexmap 2.8.0" = rec { + "indexmap 2.9.0" = rec { crateName = "indexmap"; - version = "2.8.0"; + version = "2.9.0"; edition = "2021"; - sha256 = "0n3hkpzch6q3wgzh8g8hiyac6kk3vgd8nfsxy8mi80jvw47xam1r"; + sha256 = "07m15a571yywmvqyb7ms717q9n42b46badbpsmx215jrg7dhv9yf"; dependencies = [ { name = "equivalent"; @@ -4366,13 +4453,19 @@ rec { }; "jobserver" = rec { crateName = "jobserver"; - version = "0.1.32"; + version = "0.1.33"; edition = "2021"; - sha256 = "1l2k50qmj84x9mn39ivjz76alqmx72jhm12rw33zx9xnpv5xpla8"; + sha256 = "12jkn3cxvfs7jsb6knmh9y2b41lwmrk3vdqywkmssx61jzq65wiq"; authors = [ "Alex Crichton " ]; dependencies = [ + { + name = "getrandom"; + packageId = "getrandom 0.3.2"; + target = { target, features }: (target."windows" or false); + features = [ "std" ]; + } { name = "libc"; packageId = "libc"; @@ -4574,12 +4667,12 @@ rec { "k8s-version" = rec { crateName = "k8s-version"; version = "0.1.2"; - edition = "2021"; + edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "6c4b022dcdaec09a0c0ecb420a41bb180d4edbf8"; - sha256 = "16klfwx3kz3ys7afwjicfj8msws9a718izx09jspwwpff3rl6wsi"; + rev = "0f9b6f9669051e9c4f29e6e882acf3eff3ac3f14"; + sha256 = "11zqwlwvfigca7lfsdch1wqd3vl694hff1avf6rhiawpnassj2cw"; }; libName = "k8s_version"; authors = [ @@ -5330,9 +5423,9 @@ rec { }; "log" = rec { crateName = "log"; - version = "0.4.26"; + version = "0.4.27"; edition = "2021"; - sha256 = "17mvchkvhnm2zxyfagh2g9p861f0qx2g1sg2v14sww9nvjry5g9h"; + sha256 = "150x589dqil307rv0rwj0jsgz5bjbwvl83gyl61jf873a7rjvp0k"; authors = [ "The Rust Project Developers" ]; @@ -5423,9 +5516,9 @@ rec { }; "miniz_oxide" = rec { crateName = "miniz_oxide"; - version = "0.8.5"; + version = "0.8.8"; edition = "2021"; - sha256 = "1r9whkc61xri7m1cn4rjrjlhr32ab29nvfxcbg0ri5mmpgg08glf"; + sha256 = "0al9iy33flfgxawj789w2c8xxwg1n2r5vv6m6p5hl2fvd2vlgriv"; authors = [ "Frommi " "oyvindln " @@ -5444,6 +5537,7 @@ rec { "core" = [ "dep:core" ]; "default" = [ "with-alloc" ]; "rustc-dep-of-std" = [ "core" "alloc" "compiler_builtins" "adler2/rustc-dep-of-std" ]; + "serde" = [ "dep:serde" ]; "simd" = [ "simd-adler32" ]; "simd-adler32" = [ "dep:simd-adler32" ]; }; @@ -5477,7 +5571,7 @@ rec { } { name = "wasi"; - packageId = "wasi"; + packageId = "wasi 0.11.0+wasi-snapshot-preview1"; target = { target, features }: ("wasi" == target."os" or null); } { @@ -5591,9 +5685,9 @@ rec { }; "once_cell" = rec { crateName = "once_cell"; - version = "1.21.1"; + version = "1.21.3"; edition = "2021"; - sha256 = "1g645fg3rk800ica72ypwajllgij38az3n831sm2rragrknhnnyp"; + sha256 = "0b9x77lb9f1j6nqgf5aka4s2qj0nly176bpbrv6f9iakk5ff3xa2"; authors = [ "Aleksey Kladov " ]; @@ -6216,9 +6310,9 @@ rec { }; "pest" = rec { crateName = "pest"; - version = "2.7.15"; + version = "2.8.0"; edition = "2021"; - sha256 = "1p4rq45xprw9cx0pb8mmbfa0ih49l0baablv3cpfdy3c1pkayz4b"; + sha256 = "1dp741bxqiracvvwl66mfvlr29byvvph28n4c6ip136m652vg38r"; authors = [ "Dragoș Tiselice " ]; @@ -6250,9 +6344,9 @@ rec { }; "pest_derive" = rec { crateName = "pest_derive"; - version = "2.7.15"; + version = "2.8.0"; edition = "2021"; - sha256 = "0zpmcd1jv1c53agad5b3jb66ylxlzyv43x1bssh8fs7w3i11hrc1"; + sha256 = "1icp5i01mgpbgwbkrcy4d0ykbxmns4wyz8j1jg6dr1wysz7xj9fp"; procMacro = true; authors = [ "Dragoș Tiselice " @@ -6279,9 +6373,9 @@ rec { }; "pest_generator" = rec { crateName = "pest_generator"; - version = "2.7.15"; + version = "2.8.0"; edition = "2021"; - sha256 = "0yrpk5ymc56pffv7gqr5rkv92p3dc6s73lb8hy1wf3w77byrc4vx"; + sha256 = "0hgqngsxfr8y5p47bgjvd038j55ix1x4dpzr6amndaz8ddr02zfv"; authors = [ "Dragoș Tiselice " ]; @@ -6318,9 +6412,9 @@ rec { }; "pest_meta" = rec { crateName = "pest_meta"; - version = "2.7.15"; + version = "2.8.0"; edition = "2021"; - sha256 = "1skx7gm932bp77if63f7d72jrk5gygj39d8zsfzigmr5xa4q1rg1"; + sha256 = "182w5fyiqm7zbn0p8313xc5wc73rnn59ycm5zk8hcja9f0j877vz"; authors = [ "Dragoș Tiselice " ]; @@ -6634,6 +6728,19 @@ rec { }; resolvedDefaultFeatures = [ "default" "proc-macro" ]; }; + "r-efi" = rec { + crateName = "r-efi"; + version = "5.2.0"; + edition = "2018"; + sha256 = "1ig93jvpqyi87nc5kb6dri49p56q7r7qxrn8kfizmqkfj5nmyxkl"; + libName = "r_efi"; + features = { + "compiler_builtins" = [ "dep:compiler_builtins" ]; + "core" = [ "dep:core" ]; + "examples" = [ "native" ]; + "rustc-dep-of-std" = [ "compiler_builtins/rustc-dep-of-std" "core" ]; + }; + }; "rand" = rec { crateName = "rand"; version = "0.8.5"; @@ -6720,7 +6827,7 @@ rec { dependencies = [ { name = "getrandom"; - packageId = "getrandom"; + packageId = "getrandom 0.2.15"; optional = true; } ]; @@ -6734,9 +6841,9 @@ rec { }; "redox_syscall" = rec { crateName = "redox_syscall"; - version = "0.5.10"; + version = "0.5.11"; edition = "2021"; - sha256 = "1l9b638qx72312yzh8ykvda9b3lqd9gf6yqn66b23a331ck0r30b"; + sha256 = "18qijn18r10haiglv4261wb0yh1agqqlvs0nxfy8yjbpsb307wfj"; libName = "syscall"; authors = [ "Jeremy Soller " @@ -7202,7 +7309,7 @@ rec { } { name = "getrandom"; - packageId = "getrandom"; + packageId = "getrandom 0.2.15"; } { name = "libc"; @@ -7545,9 +7652,9 @@ rec { }; "rustls-webpki" = rec { crateName = "rustls-webpki"; - version = "0.103.0"; + version = "0.103.1"; edition = "2021"; - sha256 = "0brvz1j2q8qcbrs5555wgrdzpibiz6ryk9ypx4izzzw84nnfx90a"; + sha256 = "00rcdz0rb9ia2ivrq7412ry9qkvbh78pra2phl4p7kxck9vbiy7y"; libName = "webpki"; dependencies = [ { @@ -8113,7 +8220,7 @@ rec { dependencies = [ { name = "indexmap"; - packageId = "indexmap 2.8.0"; + packageId = "indexmap 2.9.0"; } { name = "itoa"; @@ -8289,18 +8396,21 @@ rec { }; "smallvec" = rec { crateName = "smallvec"; - version = "1.14.0"; + version = "1.15.0"; edition = "2018"; - sha256 = "1z8wpr53x6jisklqhkkvkgyi8s5cn69h2d2alhqfxahzxwiq7kvz"; + sha256 = "1sgfw8z729nlxk8k13dhs0a762wnaxmlx70a7xlf3wz989bjh5w9"; authors = [ "The Servo Project Developers" ]; features = { "arbitrary" = [ "dep:arbitrary" ]; + "bincode" = [ "dep:bincode" ]; "const_new" = [ "const_generics" ]; "drain_keep_rest" = [ "drain_filter" ]; + "impl_bincode" = [ "bincode" "unty" ]; "malloc_size_of" = [ "dep:malloc_size_of" ]; "serde" = [ "dep:serde" ]; + "unty" = [ "dep:unty" ]; }; resolvedDefaultFeatures = [ "const_generics" "const_new" ]; }; @@ -8433,9 +8543,9 @@ rec { }; "socket2" = rec { crateName = "socket2"; - version = "0.5.8"; + version = "0.5.9"; edition = "2021"; - sha256 = "1s7vjmb5gzp3iaqi94rh9r63k9cj00kjgbfn7gn60kmnk6fjcw69"; + sha256 = "1vzds1wwwi0a51fn10r98j7cx3ir4shvhykpbk7md2h5h1ydapsg"; authors = [ "Alex Crichton " "Thomas de Zeeuw " @@ -8473,13 +8583,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.90.0"; + version = "0.91.1"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ea063b4595caa20c82d37c595487c76476c9ab10"; - sha256 = "0fclvpxhchykqd7bl8hscr4v06mbs2v5vjp0xv27nvqr94j63xs2"; + rev = "0f9b6f9669051e9c4f29e6e882acf3eff3ac3f14"; + sha256 = "11zqwlwvfigca7lfsdch1wqd3vl694hff1avf6rhiawpnassj2cw"; }; libName = "stackable_operator"; authors = [ @@ -8524,7 +8634,7 @@ rec { } { name = "indexmap"; - packageId = "indexmap 2.8.0"; + packageId = "indexmap 2.9.0"; } { name = "json-patch"; @@ -8584,6 +8694,16 @@ rec { name = "stackable-shared"; packageId = "stackable-shared"; } + { + name = "stackable-telemetry"; + packageId = "stackable-telemetry"; + features = [ "clap" ]; + } + { + name = "stackable-versioned"; + packageId = "stackable-versioned"; + features = [ "k8s" ]; + } { name = "strum"; packageId = "strum"; @@ -8614,8 +8734,11 @@ rec { } ]; features = { + "default" = [ "telemetry" "versioned" ]; + "full" = [ "time" "telemetry" "versioned" ]; "time" = [ "dep:time" ]; }; + resolvedDefaultFeatures = [ "default" "telemetry" "versioned" ]; }; "stackable-operator-derive" = rec { crateName = "stackable-operator-derive"; @@ -8624,8 +8747,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ea063b4595caa20c82d37c595487c76476c9ab10"; - sha256 = "0fclvpxhchykqd7bl8hscr4v06mbs2v5vjp0xv27nvqr94j63xs2"; + rev = "0f9b6f9669051e9c4f29e6e882acf3eff3ac3f14"; + sha256 = "11zqwlwvfigca7lfsdch1wqd3vl694hff1avf6rhiawpnassj2cw"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -8659,8 +8782,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ea063b4595caa20c82d37c595487c76476c9ab10"; - sha256 = "0fclvpxhchykqd7bl8hscr4v06mbs2v5vjp0xv27nvqr94j63xs2"; + rev = "0f9b6f9669051e9c4f29e6e882acf3eff3ac3f14"; + sha256 = "11zqwlwvfigca7lfsdch1wqd3vl694hff1avf6rhiawpnassj2cw"; }; libName = "stackable_shared"; authors = [ @@ -8754,15 +8877,7 @@ rec { { name = "stackable-operator"; packageId = "stackable-operator"; - } - { - name = "stackable-telemetry"; - packageId = "stackable-telemetry"; - } - { - name = "stackable-versioned"; - packageId = "stackable-versioned"; - features = [ "k8s" ]; + features = [ "telemetry" "versioned" ]; } { name = "strum"; @@ -8809,13 +8924,13 @@ rec { }; "stackable-telemetry" = rec { crateName = "stackable-telemetry"; - version = "0.4.0"; + version = "0.5.0"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "52bdee5749e217005025d07f33c7020931c31d91"; - sha256 = "0hcm64fb2ngyalq8rci5lrr881prg023pq9cd1sfr79iynbr6a26"; + rev = "0f9b6f9669051e9c4f29e6e882acf3eff3ac3f14"; + sha256 = "11zqwlwvfigca7lfsdch1wqd3vl694hff1avf6rhiawpnassj2cw"; }; libName = "stackable_telemetry"; authors = [ @@ -8826,6 +8941,12 @@ rec { name = "axum"; packageId = "axum 0.8.3"; } + { + name = "clap"; + packageId = "clap"; + optional = true; + features = [ "derive" "cargo" "env" ]; + } { name = "futures-util"; packageId = "futures-util"; @@ -8857,6 +8978,11 @@ rec { name = "snafu"; packageId = "snafu 0.8.5"; } + { + name = "strum"; + packageId = "strum"; + features = [ "derive" ]; + } { name = "tokio"; packageId = "tokio"; @@ -8896,17 +9022,20 @@ rec { packageId = "tracing-opentelemetry"; } ]; - + features = { + "clap" = [ "dep:clap" ]; + }; + resolvedDefaultFeatures = [ "clap" ]; }; "stackable-versioned" = rec { crateName = "stackable-versioned"; version = "0.7.1"; - edition = "2021"; + edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "6c4b022dcdaec09a0c0ecb420a41bb180d4edbf8"; - sha256 = "16klfwx3kz3ys7afwjicfj8msws9a718izx09jspwwpff3rl6wsi"; + rev = "0f9b6f9669051e9c4f29e6e882acf3eff3ac3f14"; + sha256 = "11zqwlwvfigca7lfsdch1wqd3vl694hff1avf6rhiawpnassj2cw"; }; libName = "stackable_versioned"; authors = [ @@ -8927,12 +9056,12 @@ rec { "stackable-versioned-macros" = rec { crateName = "stackable-versioned-macros"; version = "0.7.1"; - edition = "2021"; + edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "6c4b022dcdaec09a0c0ecb420a41bb180d4edbf8"; - sha256 = "16klfwx3kz3ys7afwjicfj8msws9a718izx09jspwwpff3rl6wsi"; + rev = "0f9b6f9669051e9c4f29e6e882acf3eff3ac3f14"; + sha256 = "11zqwlwvfigca7lfsdch1wqd3vl694hff1avf6rhiawpnassj2cw"; }; procMacro = true; libName = "stackable_versioned_macros"; @@ -9310,9 +9439,9 @@ rec { }; "time" = rec { crateName = "time"; - version = "0.3.40"; + version = "0.3.41"; edition = "2021"; - sha256 = "063n0wx3sp6w1dysp7c3kdmdimxqaq9vjgaa6finzy6zgfs7b74x"; + sha256 = "0h0cpiyya8cjlrh00d2r72bmgg4lsdcncs76qpwy0rn2kghijxla"; authors = [ "Jacob Pratt " "Time contributors" @@ -9402,9 +9531,9 @@ rec { }; "time-macros" = rec { crateName = "time-macros"; - version = "0.2.21"; + version = "0.2.22"; edition = "2021"; - sha256 = "017xcmc384r38d76j52h68hz0wf316m08l7xaznp680qhialiai9"; + sha256 = "0jcaxpw220han2bzbrdlpqhy1s5k9i8ri3lw6n5zv4zcja9p69im"; procMacro = true; libName = "time_macros"; authors = [ @@ -9456,9 +9585,9 @@ rec { }; "tokio" = rec { crateName = "tokio"; - version = "1.44.1"; + version = "1.44.2"; edition = "2021"; - sha256 = "06n90q5hh1yd844s6nf4j3fwbrkm2bnq533kp3a488l4bdhxm0pk"; + sha256 = "0j4w3qvlcqzgbxlnap0czvspqj6x461vyk1sbqcf97g4rci8if76"; authors = [ "Tokio Contributors " ]; @@ -9749,7 +9878,7 @@ rec { dependencies = [ { name = "indexmap"; - packageId = "indexmap 2.8.0"; + packageId = "indexmap 2.9.0"; features = [ "std" ]; } { @@ -10941,7 +11070,7 @@ rec { ]; }; - "wasi" = rec { + "wasi 0.11.0+wasi-snapshot-preview1" = rec { crateName = "wasi"; version = "0.11.0+wasi-snapshot-preview1"; edition = "2018"; @@ -10958,6 +11087,29 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; + "wasi 0.14.2+wasi-0.2.4" = rec { + crateName = "wasi"; + version = "0.14.2+wasi-0.2.4"; + edition = "2021"; + sha256 = "1cwcqjr3dgdq8j325awgk8a715h0hg0f7jqzsb077n4qm6jzk0wn"; + authors = [ + "The Cranelift Project Developers" + ]; + dependencies = [ + { + name = "wit-bindgen-rt"; + packageId = "wit-bindgen-rt"; + features = [ "bitflags" ]; + } + ]; + features = { + "compiler_builtins" = [ "dep:compiler_builtins" ]; + "core" = [ "dep:core" ]; + "default" = [ "std" ]; + "rustc-dep-of-std" = [ "compiler_builtins" "core" "rustc-std-workspace-alloc" ]; + "rustc-std-workspace-alloc" = [ "dep:rustc-std-workspace-alloc" ]; + }; + }; "wasm-bindgen" = rec { crateName = "wasm-bindgen"; version = "0.2.100"; @@ -11721,705 +11873,107 @@ rec { ]; }; - "windows" = rec { - crateName = "windows"; - version = "0.52.0"; + "windows-core" = rec { + crateName = "windows-core"; + version = "0.61.0"; edition = "2021"; - sha256 = "1gnh210qjlprpd1szaq04rjm1zqgdm9j7l9absg0kawi2rwm72p4"; + sha256 = "104915nsby2cgp322pqqkmj2r82v5sg4hil0hxddg1hc67gc2qs7"; + libName = "windows_core"; authors = [ "Microsoft" ]; dependencies = [ { - name = "windows-core"; - packageId = "windows-core"; + name = "windows-implement"; + packageId = "windows-implement"; + usesDefaultFeatures = false; } { - name = "windows-targets"; - packageId = "windows-targets 0.52.6"; + name = "windows-interface"; + packageId = "windows-interface"; + usesDefaultFeatures = false; + } + { + name = "windows-link"; + packageId = "windows-link"; + usesDefaultFeatures = false; + } + { + name = "windows-result"; + packageId = "windows-result"; + usesDefaultFeatures = false; + } + { + name = "windows-strings"; + packageId = "windows-strings 0.4.0"; + usesDefaultFeatures = false; } ]; features = { - "AI_MachineLearning" = [ "AI" ]; - "ApplicationModel_Activation" = [ "ApplicationModel" ]; - "ApplicationModel_AppExtensions" = [ "ApplicationModel" ]; - "ApplicationModel_AppService" = [ "ApplicationModel" ]; - "ApplicationModel_Appointments" = [ "ApplicationModel" ]; - "ApplicationModel_Appointments_AppointmentsProvider" = [ "ApplicationModel_Appointments" ]; - "ApplicationModel_Appointments_DataProvider" = [ "ApplicationModel_Appointments" ]; - "ApplicationModel_Background" = [ "ApplicationModel" ]; - "ApplicationModel_Calls" = [ "ApplicationModel" ]; - "ApplicationModel_Calls_Background" = [ "ApplicationModel_Calls" ]; - "ApplicationModel_Calls_Provider" = [ "ApplicationModel_Calls" ]; - "ApplicationModel_Chat" = [ "ApplicationModel" ]; - "ApplicationModel_CommunicationBlocking" = [ "ApplicationModel" ]; - "ApplicationModel_Contacts" = [ "ApplicationModel" ]; - "ApplicationModel_Contacts_DataProvider" = [ "ApplicationModel_Contacts" ]; - "ApplicationModel_Contacts_Provider" = [ "ApplicationModel_Contacts" ]; - "ApplicationModel_ConversationalAgent" = [ "ApplicationModel" ]; - "ApplicationModel_Core" = [ "ApplicationModel" ]; - "ApplicationModel_DataTransfer" = [ "ApplicationModel" ]; - "ApplicationModel_DataTransfer_DragDrop" = [ "ApplicationModel_DataTransfer" ]; - "ApplicationModel_DataTransfer_DragDrop_Core" = [ "ApplicationModel_DataTransfer_DragDrop" ]; - "ApplicationModel_DataTransfer_ShareTarget" = [ "ApplicationModel_DataTransfer" ]; - "ApplicationModel_Email" = [ "ApplicationModel" ]; - "ApplicationModel_Email_DataProvider" = [ "ApplicationModel_Email" ]; - "ApplicationModel_ExtendedExecution" = [ "ApplicationModel" ]; - "ApplicationModel_ExtendedExecution_Foreground" = [ "ApplicationModel_ExtendedExecution" ]; - "ApplicationModel_Holographic" = [ "ApplicationModel" ]; - "ApplicationModel_LockScreen" = [ "ApplicationModel" ]; - "ApplicationModel_Payments" = [ "ApplicationModel" ]; - "ApplicationModel_Payments_Provider" = [ "ApplicationModel_Payments" ]; - "ApplicationModel_Preview" = [ "ApplicationModel" ]; - "ApplicationModel_Preview_Holographic" = [ "ApplicationModel_Preview" ]; - "ApplicationModel_Preview_InkWorkspace" = [ "ApplicationModel_Preview" ]; - "ApplicationModel_Preview_Notes" = [ "ApplicationModel_Preview" ]; - "ApplicationModel_Resources" = [ "ApplicationModel" ]; - "ApplicationModel_Resources_Core" = [ "ApplicationModel_Resources" ]; - "ApplicationModel_Resources_Management" = [ "ApplicationModel_Resources" ]; - "ApplicationModel_Search" = [ "ApplicationModel" ]; - "ApplicationModel_Search_Core" = [ "ApplicationModel_Search" ]; - "ApplicationModel_Store" = [ "ApplicationModel" ]; - "ApplicationModel_Store_LicenseManagement" = [ "ApplicationModel_Store" ]; - "ApplicationModel_Store_Preview" = [ "ApplicationModel_Store" ]; - "ApplicationModel_Store_Preview_InstallControl" = [ "ApplicationModel_Store_Preview" ]; - "ApplicationModel_UserActivities" = [ "ApplicationModel" ]; - "ApplicationModel_UserActivities_Core" = [ "ApplicationModel_UserActivities" ]; - "ApplicationModel_UserDataAccounts" = [ "ApplicationModel" ]; - "ApplicationModel_UserDataAccounts_Provider" = [ "ApplicationModel_UserDataAccounts" ]; - "ApplicationModel_UserDataAccounts_SystemAccess" = [ "ApplicationModel_UserDataAccounts" ]; - "ApplicationModel_UserDataTasks" = [ "ApplicationModel" ]; - "ApplicationModel_UserDataTasks_DataProvider" = [ "ApplicationModel_UserDataTasks" ]; - "ApplicationModel_VoiceCommands" = [ "ApplicationModel" ]; - "ApplicationModel_Wallet" = [ "ApplicationModel" ]; - "ApplicationModel_Wallet_System" = [ "ApplicationModel_Wallet" ]; - "Data_Html" = [ "Data" ]; - "Data_Json" = [ "Data" ]; - "Data_Pdf" = [ "Data" ]; - "Data_Text" = [ "Data" ]; - "Data_Xml" = [ "Data" ]; - "Data_Xml_Dom" = [ "Data_Xml" ]; - "Data_Xml_Xsl" = [ "Data_Xml" ]; - "Devices_Adc" = [ "Devices" ]; - "Devices_Adc_Provider" = [ "Devices_Adc" ]; - "Devices_Background" = [ "Devices" ]; - "Devices_Bluetooth" = [ "Devices" ]; - "Devices_Bluetooth_Advertisement" = [ "Devices_Bluetooth" ]; - "Devices_Bluetooth_Background" = [ "Devices_Bluetooth" ]; - "Devices_Bluetooth_GenericAttributeProfile" = [ "Devices_Bluetooth" ]; - "Devices_Bluetooth_Rfcomm" = [ "Devices_Bluetooth" ]; - "Devices_Custom" = [ "Devices" ]; - "Devices_Display" = [ "Devices" ]; - "Devices_Display_Core" = [ "Devices_Display" ]; - "Devices_Enumeration" = [ "Devices" ]; - "Devices_Enumeration_Pnp" = [ "Devices_Enumeration" ]; - "Devices_Geolocation" = [ "Devices" ]; - "Devices_Geolocation_Geofencing" = [ "Devices_Geolocation" ]; - "Devices_Geolocation_Provider" = [ "Devices_Geolocation" ]; - "Devices_Gpio" = [ "Devices" ]; - "Devices_Gpio_Provider" = [ "Devices_Gpio" ]; - "Devices_Haptics" = [ "Devices" ]; - "Devices_HumanInterfaceDevice" = [ "Devices" ]; - "Devices_I2c" = [ "Devices" ]; - "Devices_I2c_Provider" = [ "Devices_I2c" ]; - "Devices_Input" = [ "Devices" ]; - "Devices_Input_Preview" = [ "Devices_Input" ]; - "Devices_Lights" = [ "Devices" ]; - "Devices_Lights_Effects" = [ "Devices_Lights" ]; - "Devices_Midi" = [ "Devices" ]; - "Devices_PointOfService" = [ "Devices" ]; - "Devices_PointOfService_Provider" = [ "Devices_PointOfService" ]; - "Devices_Portable" = [ "Devices" ]; - "Devices_Power" = [ "Devices" ]; - "Devices_Printers" = [ "Devices" ]; - "Devices_Printers_Extensions" = [ "Devices_Printers" ]; - "Devices_Pwm" = [ "Devices" ]; - "Devices_Pwm_Provider" = [ "Devices_Pwm" ]; - "Devices_Radios" = [ "Devices" ]; - "Devices_Scanners" = [ "Devices" ]; - "Devices_Sensors" = [ "Devices" ]; - "Devices_Sensors_Custom" = [ "Devices_Sensors" ]; - "Devices_SerialCommunication" = [ "Devices" ]; - "Devices_SmartCards" = [ "Devices" ]; - "Devices_Sms" = [ "Devices" ]; - "Devices_Spi" = [ "Devices" ]; - "Devices_Spi_Provider" = [ "Devices_Spi" ]; - "Devices_Usb" = [ "Devices" ]; - "Devices_WiFi" = [ "Devices" ]; - "Devices_WiFiDirect" = [ "Devices" ]; - "Devices_WiFiDirect_Services" = [ "Devices_WiFiDirect" ]; - "Embedded_DeviceLockdown" = [ "Embedded" ]; - "Foundation_Collections" = [ "Foundation" ]; - "Foundation_Diagnostics" = [ "Foundation" ]; - "Foundation_Metadata" = [ "Foundation" ]; - "Foundation_Numerics" = [ "Foundation" ]; - "Gaming_Input" = [ "Gaming" ]; - "Gaming_Input_Custom" = [ "Gaming_Input" ]; - "Gaming_Input_ForceFeedback" = [ "Gaming_Input" ]; - "Gaming_Input_Preview" = [ "Gaming_Input" ]; - "Gaming_Preview" = [ "Gaming" ]; - "Gaming_Preview_GamesEnumeration" = [ "Gaming_Preview" ]; - "Gaming_UI" = [ "Gaming" ]; - "Gaming_XboxLive" = [ "Gaming" ]; - "Gaming_XboxLive_Storage" = [ "Gaming_XboxLive" ]; - "Globalization_Collation" = [ "Globalization" ]; - "Globalization_DateTimeFormatting" = [ "Globalization" ]; - "Globalization_Fonts" = [ "Globalization" ]; - "Globalization_NumberFormatting" = [ "Globalization" ]; - "Globalization_PhoneNumberFormatting" = [ "Globalization" ]; - "Graphics_Capture" = [ "Graphics" ]; - "Graphics_DirectX" = [ "Graphics" ]; - "Graphics_DirectX_Direct3D11" = [ "Graphics_DirectX" ]; - "Graphics_Display" = [ "Graphics" ]; - "Graphics_Display_Core" = [ "Graphics_Display" ]; - "Graphics_Effects" = [ "Graphics" ]; - "Graphics_Holographic" = [ "Graphics" ]; - "Graphics_Imaging" = [ "Graphics" ]; - "Graphics_Printing" = [ "Graphics" ]; - "Graphics_Printing3D" = [ "Graphics" ]; - "Graphics_Printing_OptionDetails" = [ "Graphics_Printing" ]; - "Graphics_Printing_PrintSupport" = [ "Graphics_Printing" ]; - "Graphics_Printing_PrintTicket" = [ "Graphics_Printing" ]; - "Graphics_Printing_Workflow" = [ "Graphics_Printing" ]; - "Management_Core" = [ "Management" ]; - "Management_Deployment" = [ "Management" ]; - "Management_Deployment_Preview" = [ "Management_Deployment" ]; - "Management_Policies" = [ "Management" ]; - "Management_Update" = [ "Management" ]; - "Management_Workplace" = [ "Management" ]; - "Media_AppBroadcasting" = [ "Media" ]; - "Media_AppRecording" = [ "Media" ]; - "Media_Audio" = [ "Media" ]; - "Media_Capture" = [ "Media" ]; - "Media_Capture_Core" = [ "Media_Capture" ]; - "Media_Capture_Frames" = [ "Media_Capture" ]; - "Media_Casting" = [ "Media" ]; - "Media_ClosedCaptioning" = [ "Media" ]; - "Media_ContentRestrictions" = [ "Media" ]; - "Media_Control" = [ "Media" ]; - "Media_Core" = [ "Media" ]; - "Media_Core_Preview" = [ "Media_Core" ]; - "Media_Devices" = [ "Media" ]; - "Media_Devices_Core" = [ "Media_Devices" ]; - "Media_DialProtocol" = [ "Media" ]; - "Media_Editing" = [ "Media" ]; - "Media_Effects" = [ "Media" ]; - "Media_FaceAnalysis" = [ "Media" ]; - "Media_Import" = [ "Media" ]; - "Media_MediaProperties" = [ "Media" ]; - "Media_Miracast" = [ "Media" ]; - "Media_Ocr" = [ "Media" ]; - "Media_PlayTo" = [ "Media" ]; - "Media_Playback" = [ "Media" ]; - "Media_Playlists" = [ "Media" ]; - "Media_Protection" = [ "Media" ]; - "Media_Protection_PlayReady" = [ "Media_Protection" ]; - "Media_Render" = [ "Media" ]; - "Media_SpeechRecognition" = [ "Media" ]; - "Media_SpeechSynthesis" = [ "Media" ]; - "Media_Streaming" = [ "Media" ]; - "Media_Streaming_Adaptive" = [ "Media_Streaming" ]; - "Media_Transcoding" = [ "Media" ]; - "Networking_BackgroundTransfer" = [ "Networking" ]; - "Networking_Connectivity" = [ "Networking" ]; - "Networking_NetworkOperators" = [ "Networking" ]; - "Networking_Proximity" = [ "Networking" ]; - "Networking_PushNotifications" = [ "Networking" ]; - "Networking_ServiceDiscovery" = [ "Networking" ]; - "Networking_ServiceDiscovery_Dnssd" = [ "Networking_ServiceDiscovery" ]; - "Networking_Sockets" = [ "Networking" ]; - "Networking_Vpn" = [ "Networking" ]; - "Networking_XboxLive" = [ "Networking" ]; - "Perception_Automation" = [ "Perception" ]; - "Perception_Automation_Core" = [ "Perception_Automation" ]; - "Perception_People" = [ "Perception" ]; - "Perception_Spatial" = [ "Perception" ]; - "Perception_Spatial_Preview" = [ "Perception_Spatial" ]; - "Perception_Spatial_Surfaces" = [ "Perception_Spatial" ]; - "Phone_ApplicationModel" = [ "Phone" ]; - "Phone_Devices" = [ "Phone" ]; - "Phone_Devices_Notification" = [ "Phone_Devices" ]; - "Phone_Devices_Power" = [ "Phone_Devices" ]; - "Phone_Management" = [ "Phone" ]; - "Phone_Management_Deployment" = [ "Phone_Management" ]; - "Phone_Media" = [ "Phone" ]; - "Phone_Media_Devices" = [ "Phone_Media" ]; - "Phone_Notification" = [ "Phone" ]; - "Phone_Notification_Management" = [ "Phone_Notification" ]; - "Phone_PersonalInformation" = [ "Phone" ]; - "Phone_PersonalInformation_Provisioning" = [ "Phone_PersonalInformation" ]; - "Phone_Speech" = [ "Phone" ]; - "Phone_Speech_Recognition" = [ "Phone_Speech" ]; - "Phone_StartScreen" = [ "Phone" ]; - "Phone_System" = [ "Phone" ]; - "Phone_System_Power" = [ "Phone_System" ]; - "Phone_System_Profile" = [ "Phone_System" ]; - "Phone_System_UserProfile" = [ "Phone_System" ]; - "Phone_System_UserProfile_GameServices" = [ "Phone_System_UserProfile" ]; - "Phone_System_UserProfile_GameServices_Core" = [ "Phone_System_UserProfile_GameServices" ]; - "Phone_UI" = [ "Phone" ]; - "Phone_UI_Input" = [ "Phone_UI" ]; - "Security_Authentication" = [ "Security" ]; - "Security_Authentication_Identity" = [ "Security_Authentication" ]; - "Security_Authentication_Identity_Core" = [ "Security_Authentication_Identity" ]; - "Security_Authentication_OnlineId" = [ "Security_Authentication" ]; - "Security_Authentication_Web" = [ "Security_Authentication" ]; - "Security_Authentication_Web_Core" = [ "Security_Authentication_Web" ]; - "Security_Authentication_Web_Provider" = [ "Security_Authentication_Web" ]; - "Security_Authorization" = [ "Security" ]; - "Security_Authorization_AppCapabilityAccess" = [ "Security_Authorization" ]; - "Security_Credentials" = [ "Security" ]; - "Security_Credentials_UI" = [ "Security_Credentials" ]; - "Security_Cryptography" = [ "Security" ]; - "Security_Cryptography_Certificates" = [ "Security_Cryptography" ]; - "Security_Cryptography_Core" = [ "Security_Cryptography" ]; - "Security_Cryptography_DataProtection" = [ "Security_Cryptography" ]; - "Security_DataProtection" = [ "Security" ]; - "Security_EnterpriseData" = [ "Security" ]; - "Security_ExchangeActiveSyncProvisioning" = [ "Security" ]; - "Security_Isolation" = [ "Security" ]; - "Services_Maps" = [ "Services" ]; - "Services_Maps_Guidance" = [ "Services_Maps" ]; - "Services_Maps_LocalSearch" = [ "Services_Maps" ]; - "Services_Maps_OfflineMaps" = [ "Services_Maps" ]; - "Services_Store" = [ "Services" ]; - "Services_TargetedContent" = [ "Services" ]; - "Storage_AccessCache" = [ "Storage" ]; - "Storage_BulkAccess" = [ "Storage" ]; - "Storage_Compression" = [ "Storage" ]; - "Storage_FileProperties" = [ "Storage" ]; - "Storage_Pickers" = [ "Storage" ]; - "Storage_Pickers_Provider" = [ "Storage_Pickers" ]; - "Storage_Provider" = [ "Storage" ]; - "Storage_Search" = [ "Storage" ]; - "Storage_Streams" = [ "Storage" ]; - "System_Diagnostics" = [ "System" ]; - "System_Diagnostics_DevicePortal" = [ "System_Diagnostics" ]; - "System_Diagnostics_Telemetry" = [ "System_Diagnostics" ]; - "System_Diagnostics_TraceReporting" = [ "System_Diagnostics" ]; - "System_Display" = [ "System" ]; - "System_Implementation" = [ "System" ]; - "System_Implementation_FileExplorer" = [ "System_Implementation" ]; - "System_Inventory" = [ "System" ]; - "System_Power" = [ "System" ]; - "System_Profile" = [ "System" ]; - "System_Profile_SystemManufacturers" = [ "System_Profile" ]; - "System_RemoteDesktop" = [ "System" ]; - "System_RemoteDesktop_Input" = [ "System_RemoteDesktop" ]; - "System_RemoteSystems" = [ "System" ]; - "System_Threading" = [ "System" ]; - "System_Threading_Core" = [ "System_Threading" ]; - "System_Update" = [ "System" ]; - "System_UserProfile" = [ "System" ]; - "UI_Accessibility" = [ "UI" ]; - "UI_ApplicationSettings" = [ "UI" ]; - "UI_Composition" = [ "UI" ]; - "UI_Composition_Core" = [ "UI_Composition" ]; - "UI_Composition_Desktop" = [ "UI_Composition" ]; - "UI_Composition_Diagnostics" = [ "UI_Composition" ]; - "UI_Composition_Effects" = [ "UI_Composition" ]; - "UI_Composition_Interactions" = [ "UI_Composition" ]; - "UI_Composition_Scenes" = [ "UI_Composition" ]; - "UI_Core" = [ "UI" ]; - "UI_Core_AnimationMetrics" = [ "UI_Core" ]; - "UI_Core_Preview" = [ "UI_Core" ]; - "UI_Input" = [ "UI" ]; - "UI_Input_Core" = [ "UI_Input" ]; - "UI_Input_Inking" = [ "UI_Input" ]; - "UI_Input_Inking_Analysis" = [ "UI_Input_Inking" ]; - "UI_Input_Inking_Core" = [ "UI_Input_Inking" ]; - "UI_Input_Inking_Preview" = [ "UI_Input_Inking" ]; - "UI_Input_Preview" = [ "UI_Input" ]; - "UI_Input_Preview_Injection" = [ "UI_Input_Preview" ]; - "UI_Input_Spatial" = [ "UI_Input" ]; - "UI_Notifications" = [ "UI" ]; - "UI_Notifications_Management" = [ "UI_Notifications" ]; - "UI_Popups" = [ "UI" ]; - "UI_Shell" = [ "UI" ]; - "UI_StartScreen" = [ "UI" ]; - "UI_Text" = [ "UI" ]; - "UI_Text_Core" = [ "UI_Text" ]; - "UI_UIAutomation" = [ "UI" ]; - "UI_UIAutomation_Core" = [ "UI_UIAutomation" ]; - "UI_ViewManagement" = [ "UI" ]; - "UI_ViewManagement_Core" = [ "UI_ViewManagement" ]; - "UI_WebUI" = [ "UI" ]; - "UI_WebUI_Core" = [ "UI_WebUI" ]; - "UI_WindowManagement" = [ "UI" ]; - "UI_WindowManagement_Preview" = [ "UI_WindowManagement" ]; - "Wdk_Foundation" = [ "Wdk" ]; - "Wdk_Graphics" = [ "Wdk" ]; - "Wdk_Graphics_Direct3D" = [ "Wdk_Graphics" ]; - "Wdk_Storage" = [ "Wdk" ]; - "Wdk_Storage_FileSystem" = [ "Wdk_Storage" ]; - "Wdk_Storage_FileSystem_Minifilters" = [ "Wdk_Storage_FileSystem" ]; - "Wdk_System" = [ "Wdk" ]; - "Wdk_System_IO" = [ "Wdk_System" ]; - "Wdk_System_OfflineRegistry" = [ "Wdk_System" ]; - "Wdk_System_Registry" = [ "Wdk_System" ]; - "Wdk_System_SystemInformation" = [ "Wdk_System" ]; - "Wdk_System_SystemServices" = [ "Wdk_System" ]; - "Wdk_System_Threading" = [ "Wdk_System" ]; - "Web_AtomPub" = [ "Web" ]; - "Web_Http" = [ "Web" ]; - "Web_Http_Diagnostics" = [ "Web_Http" ]; - "Web_Http_Filters" = [ "Web_Http" ]; - "Web_Http_Headers" = [ "Web_Http" ]; - "Web_Syndication" = [ "Web" ]; - "Web_UI" = [ "Web" ]; - "Web_UI_Interop" = [ "Web_UI" ]; - "Win32_AI" = [ "Win32" ]; - "Win32_AI_MachineLearning" = [ "Win32_AI" ]; - "Win32_AI_MachineLearning_DirectML" = [ "Win32_AI_MachineLearning" ]; - "Win32_AI_MachineLearning_WinML" = [ "Win32_AI_MachineLearning" ]; - "Win32_Data" = [ "Win32" ]; - "Win32_Data_HtmlHelp" = [ "Win32_Data" ]; - "Win32_Data_RightsManagement" = [ "Win32_Data" ]; - "Win32_Data_Xml" = [ "Win32_Data" ]; - "Win32_Data_Xml_MsXml" = [ "Win32_Data_Xml" ]; - "Win32_Data_Xml_XmlLite" = [ "Win32_Data_Xml" ]; - "Win32_Devices" = [ "Win32" ]; - "Win32_Devices_AllJoyn" = [ "Win32_Devices" ]; - "Win32_Devices_BiometricFramework" = [ "Win32_Devices" ]; - "Win32_Devices_Bluetooth" = [ "Win32_Devices" ]; - "Win32_Devices_Communication" = [ "Win32_Devices" ]; - "Win32_Devices_DeviceAccess" = [ "Win32_Devices" ]; - "Win32_Devices_DeviceAndDriverInstallation" = [ "Win32_Devices" ]; - "Win32_Devices_DeviceQuery" = [ "Win32_Devices" ]; - "Win32_Devices_Display" = [ "Win32_Devices" ]; - "Win32_Devices_Enumeration" = [ "Win32_Devices" ]; - "Win32_Devices_Enumeration_Pnp" = [ "Win32_Devices_Enumeration" ]; - "Win32_Devices_Fax" = [ "Win32_Devices" ]; - "Win32_Devices_FunctionDiscovery" = [ "Win32_Devices" ]; - "Win32_Devices_Geolocation" = [ "Win32_Devices" ]; - "Win32_Devices_HumanInterfaceDevice" = [ "Win32_Devices" ]; - "Win32_Devices_ImageAcquisition" = [ "Win32_Devices" ]; - "Win32_Devices_PortableDevices" = [ "Win32_Devices" ]; - "Win32_Devices_Properties" = [ "Win32_Devices" ]; - "Win32_Devices_Pwm" = [ "Win32_Devices" ]; - "Win32_Devices_Sensors" = [ "Win32_Devices" ]; - "Win32_Devices_SerialCommunication" = [ "Win32_Devices" ]; - "Win32_Devices_Tapi" = [ "Win32_Devices" ]; - "Win32_Devices_Usb" = [ "Win32_Devices" ]; - "Win32_Devices_WebServicesOnDevices" = [ "Win32_Devices" ]; - "Win32_Foundation" = [ "Win32" ]; - "Win32_Gaming" = [ "Win32" ]; - "Win32_Globalization" = [ "Win32" ]; - "Win32_Graphics" = [ "Win32" ]; - "Win32_Graphics_CompositionSwapchain" = [ "Win32_Graphics" ]; - "Win32_Graphics_DXCore" = [ "Win32_Graphics" ]; - "Win32_Graphics_Direct2D" = [ "Win32_Graphics" ]; - "Win32_Graphics_Direct2D_Common" = [ "Win32_Graphics_Direct2D" ]; - "Win32_Graphics_Direct3D" = [ "Win32_Graphics" ]; - "Win32_Graphics_Direct3D10" = [ "Win32_Graphics" ]; - "Win32_Graphics_Direct3D11" = [ "Win32_Graphics" ]; - "Win32_Graphics_Direct3D11on12" = [ "Win32_Graphics" ]; - "Win32_Graphics_Direct3D12" = [ "Win32_Graphics" ]; - "Win32_Graphics_Direct3D9" = [ "Win32_Graphics" ]; - "Win32_Graphics_Direct3D9on12" = [ "Win32_Graphics" ]; - "Win32_Graphics_Direct3D_Dxc" = [ "Win32_Graphics_Direct3D" ]; - "Win32_Graphics_Direct3D_Fxc" = [ "Win32_Graphics_Direct3D" ]; - "Win32_Graphics_DirectComposition" = [ "Win32_Graphics" ]; - "Win32_Graphics_DirectDraw" = [ "Win32_Graphics" ]; - "Win32_Graphics_DirectManipulation" = [ "Win32_Graphics" ]; - "Win32_Graphics_DirectWrite" = [ "Win32_Graphics" ]; - "Win32_Graphics_Dwm" = [ "Win32_Graphics" ]; - "Win32_Graphics_Dxgi" = [ "Win32_Graphics" ]; - "Win32_Graphics_Dxgi_Common" = [ "Win32_Graphics_Dxgi" ]; - "Win32_Graphics_Gdi" = [ "Win32_Graphics" ]; - "Win32_Graphics_GdiPlus" = [ "Win32_Graphics" ]; - "Win32_Graphics_Hlsl" = [ "Win32_Graphics" ]; - "Win32_Graphics_Imaging" = [ "Win32_Graphics" ]; - "Win32_Graphics_Imaging_D2D" = [ "Win32_Graphics_Imaging" ]; - "Win32_Graphics_OpenGL" = [ "Win32_Graphics" ]; - "Win32_Graphics_Printing" = [ "Win32_Graphics" ]; - "Win32_Graphics_Printing_PrintTicket" = [ "Win32_Graphics_Printing" ]; - "Win32_Management" = [ "Win32" ]; - "Win32_Management_MobileDeviceManagementRegistration" = [ "Win32_Management" ]; - "Win32_Media" = [ "Win32" ]; - "Win32_Media_Audio" = [ "Win32_Media" ]; - "Win32_Media_Audio_Apo" = [ "Win32_Media_Audio" ]; - "Win32_Media_Audio_DirectMusic" = [ "Win32_Media_Audio" ]; - "Win32_Media_Audio_DirectSound" = [ "Win32_Media_Audio" ]; - "Win32_Media_Audio_Endpoints" = [ "Win32_Media_Audio" ]; - "Win32_Media_Audio_XAudio2" = [ "Win32_Media_Audio" ]; - "Win32_Media_DeviceManager" = [ "Win32_Media" ]; - "Win32_Media_DirectShow" = [ "Win32_Media" ]; - "Win32_Media_DirectShow_Tv" = [ "Win32_Media_DirectShow" ]; - "Win32_Media_DirectShow_Xml" = [ "Win32_Media_DirectShow" ]; - "Win32_Media_DxMediaObjects" = [ "Win32_Media" ]; - "Win32_Media_KernelStreaming" = [ "Win32_Media" ]; - "Win32_Media_LibrarySharingServices" = [ "Win32_Media" ]; - "Win32_Media_MediaFoundation" = [ "Win32_Media" ]; - "Win32_Media_MediaPlayer" = [ "Win32_Media" ]; - "Win32_Media_Multimedia" = [ "Win32_Media" ]; - "Win32_Media_PictureAcquisition" = [ "Win32_Media" ]; - "Win32_Media_Speech" = [ "Win32_Media" ]; - "Win32_Media_Streaming" = [ "Win32_Media" ]; - "Win32_Media_WindowsMediaFormat" = [ "Win32_Media" ]; - "Win32_NetworkManagement" = [ "Win32" ]; - "Win32_NetworkManagement_Dhcp" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_Dns" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_InternetConnectionWizard" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_IpHelper" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_MobileBroadband" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_Multicast" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_Ndis" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_NetBios" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_NetManagement" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_NetShell" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_NetworkDiagnosticsFramework" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_NetworkPolicyServer" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_P2P" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_QoS" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_Rras" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_Snmp" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_WNet" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_WebDav" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_WiFi" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_WindowsConnectNow" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_WindowsConnectionManager" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_WindowsFilteringPlatform" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_WindowsFirewall" = [ "Win32_NetworkManagement" ]; - "Win32_NetworkManagement_WindowsNetworkVirtualization" = [ "Win32_NetworkManagement" ]; - "Win32_Networking" = [ "Win32" ]; - "Win32_Networking_ActiveDirectory" = [ "Win32_Networking" ]; - "Win32_Networking_BackgroundIntelligentTransferService" = [ "Win32_Networking" ]; - "Win32_Networking_Clustering" = [ "Win32_Networking" ]; - "Win32_Networking_HttpServer" = [ "Win32_Networking" ]; - "Win32_Networking_Ldap" = [ "Win32_Networking" ]; - "Win32_Networking_NetworkListManager" = [ "Win32_Networking" ]; - "Win32_Networking_RemoteDifferentialCompression" = [ "Win32_Networking" ]; - "Win32_Networking_WebSocket" = [ "Win32_Networking" ]; - "Win32_Networking_WinHttp" = [ "Win32_Networking" ]; - "Win32_Networking_WinInet" = [ "Win32_Networking" ]; - "Win32_Networking_WinSock" = [ "Win32_Networking" ]; - "Win32_Networking_WindowsWebServices" = [ "Win32_Networking" ]; - "Win32_Security" = [ "Win32" ]; - "Win32_Security_AppLocker" = [ "Win32_Security" ]; - "Win32_Security_Authentication" = [ "Win32_Security" ]; - "Win32_Security_Authentication_Identity" = [ "Win32_Security_Authentication" ]; - "Win32_Security_Authentication_Identity_Provider" = [ "Win32_Security_Authentication_Identity" ]; - "Win32_Security_Authorization" = [ "Win32_Security" ]; - "Win32_Security_Authorization_UI" = [ "Win32_Security_Authorization" ]; - "Win32_Security_ConfigurationSnapin" = [ "Win32_Security" ]; - "Win32_Security_Credentials" = [ "Win32_Security" ]; - "Win32_Security_Cryptography" = [ "Win32_Security" ]; - "Win32_Security_Cryptography_Catalog" = [ "Win32_Security_Cryptography" ]; - "Win32_Security_Cryptography_Certificates" = [ "Win32_Security_Cryptography" ]; - "Win32_Security_Cryptography_Sip" = [ "Win32_Security_Cryptography" ]; - "Win32_Security_Cryptography_UI" = [ "Win32_Security_Cryptography" ]; - "Win32_Security_DiagnosticDataQuery" = [ "Win32_Security" ]; - "Win32_Security_DirectoryServices" = [ "Win32_Security" ]; - "Win32_Security_EnterpriseData" = [ "Win32_Security" ]; - "Win32_Security_ExtensibleAuthenticationProtocol" = [ "Win32_Security" ]; - "Win32_Security_Isolation" = [ "Win32_Security" ]; - "Win32_Security_LicenseProtection" = [ "Win32_Security" ]; - "Win32_Security_NetworkAccessProtection" = [ "Win32_Security" ]; - "Win32_Security_Tpm" = [ "Win32_Security" ]; - "Win32_Security_WinTrust" = [ "Win32_Security" ]; - "Win32_Security_WinWlx" = [ "Win32_Security" ]; - "Win32_Storage" = [ "Win32" ]; - "Win32_Storage_Cabinets" = [ "Win32_Storage" ]; - "Win32_Storage_CloudFilters" = [ "Win32_Storage" ]; - "Win32_Storage_Compression" = [ "Win32_Storage" ]; - "Win32_Storage_DataDeduplication" = [ "Win32_Storage" ]; - "Win32_Storage_DistributedFileSystem" = [ "Win32_Storage" ]; - "Win32_Storage_EnhancedStorage" = [ "Win32_Storage" ]; - "Win32_Storage_FileHistory" = [ "Win32_Storage" ]; - "Win32_Storage_FileServerResourceManager" = [ "Win32_Storage" ]; - "Win32_Storage_FileSystem" = [ "Win32_Storage" ]; - "Win32_Storage_Imapi" = [ "Win32_Storage" ]; - "Win32_Storage_IndexServer" = [ "Win32_Storage" ]; - "Win32_Storage_InstallableFileSystems" = [ "Win32_Storage" ]; - "Win32_Storage_IscsiDisc" = [ "Win32_Storage" ]; - "Win32_Storage_Jet" = [ "Win32_Storage" ]; - "Win32_Storage_Nvme" = [ "Win32_Storage" ]; - "Win32_Storage_OfflineFiles" = [ "Win32_Storage" ]; - "Win32_Storage_OperationRecorder" = [ "Win32_Storage" ]; - "Win32_Storage_Packaging" = [ "Win32_Storage" ]; - "Win32_Storage_Packaging_Appx" = [ "Win32_Storage_Packaging" ]; - "Win32_Storage_Packaging_Opc" = [ "Win32_Storage_Packaging" ]; - "Win32_Storage_ProjectedFileSystem" = [ "Win32_Storage" ]; - "Win32_Storage_StructuredStorage" = [ "Win32_Storage" ]; - "Win32_Storage_Vhd" = [ "Win32_Storage" ]; - "Win32_Storage_VirtualDiskService" = [ "Win32_Storage" ]; - "Win32_Storage_Vss" = [ "Win32_Storage" ]; - "Win32_Storage_Xps" = [ "Win32_Storage" ]; - "Win32_Storage_Xps_Printing" = [ "Win32_Storage_Xps" ]; - "Win32_System" = [ "Win32" ]; - "Win32_System_AddressBook" = [ "Win32_System" ]; - "Win32_System_Antimalware" = [ "Win32_System" ]; - "Win32_System_ApplicationInstallationAndServicing" = [ "Win32_System" ]; - "Win32_System_ApplicationVerifier" = [ "Win32_System" ]; - "Win32_System_AssessmentTool" = [ "Win32_System" ]; - "Win32_System_ClrHosting" = [ "Win32_System" ]; - "Win32_System_Com" = [ "Win32_System" ]; - "Win32_System_Com_CallObj" = [ "Win32_System_Com" ]; - "Win32_System_Com_ChannelCredentials" = [ "Win32_System_Com" ]; - "Win32_System_Com_Events" = [ "Win32_System_Com" ]; - "Win32_System_Com_Marshal" = [ "Win32_System_Com" ]; - "Win32_System_Com_StructuredStorage" = [ "Win32_System_Com" ]; - "Win32_System_Com_UI" = [ "Win32_System_Com" ]; - "Win32_System_Com_Urlmon" = [ "Win32_System_Com" ]; - "Win32_System_ComponentServices" = [ "Win32_System" ]; - "Win32_System_Console" = [ "Win32_System" ]; - "Win32_System_Contacts" = [ "Win32_System" ]; - "Win32_System_CorrelationVector" = [ "Win32_System" ]; - "Win32_System_DataExchange" = [ "Win32_System" ]; - "Win32_System_DeploymentServices" = [ "Win32_System" ]; - "Win32_System_DesktopSharing" = [ "Win32_System" ]; - "Win32_System_DeveloperLicensing" = [ "Win32_System" ]; - "Win32_System_Diagnostics" = [ "Win32_System" ]; - "Win32_System_Diagnostics_Ceip" = [ "Win32_System_Diagnostics" ]; - "Win32_System_Diagnostics_ClrProfiling" = [ "Win32_System_Diagnostics" ]; - "Win32_System_Diagnostics_Debug" = [ "Win32_System_Diagnostics" ]; - "Win32_System_Diagnostics_Debug_ActiveScript" = [ "Win32_System_Diagnostics_Debug" ]; - "Win32_System_Diagnostics_Debug_Extensions" = [ "Win32_System_Diagnostics_Debug" ]; - "Win32_System_Diagnostics_Etw" = [ "Win32_System_Diagnostics" ]; - "Win32_System_Diagnostics_ProcessSnapshotting" = [ "Win32_System_Diagnostics" ]; - "Win32_System_Diagnostics_ToolHelp" = [ "Win32_System_Diagnostics" ]; - "Win32_System_DistributedTransactionCoordinator" = [ "Win32_System" ]; - "Win32_System_Environment" = [ "Win32_System" ]; - "Win32_System_ErrorReporting" = [ "Win32_System" ]; - "Win32_System_EventCollector" = [ "Win32_System" ]; - "Win32_System_EventLog" = [ "Win32_System" ]; - "Win32_System_EventNotificationService" = [ "Win32_System" ]; - "Win32_System_GroupPolicy" = [ "Win32_System" ]; - "Win32_System_HostCompute" = [ "Win32_System" ]; - "Win32_System_HostComputeNetwork" = [ "Win32_System" ]; - "Win32_System_HostComputeSystem" = [ "Win32_System" ]; - "Win32_System_Hypervisor" = [ "Win32_System" ]; - "Win32_System_IO" = [ "Win32_System" ]; - "Win32_System_Iis" = [ "Win32_System" ]; - "Win32_System_Ioctl" = [ "Win32_System" ]; - "Win32_System_JobObjects" = [ "Win32_System" ]; - "Win32_System_Js" = [ "Win32_System" ]; - "Win32_System_Kernel" = [ "Win32_System" ]; - "Win32_System_LibraryLoader" = [ "Win32_System" ]; - "Win32_System_Mailslots" = [ "Win32_System" ]; - "Win32_System_Mapi" = [ "Win32_System" ]; - "Win32_System_Memory" = [ "Win32_System" ]; - "Win32_System_Memory_NonVolatile" = [ "Win32_System_Memory" ]; - "Win32_System_MessageQueuing" = [ "Win32_System" ]; - "Win32_System_MixedReality" = [ "Win32_System" ]; - "Win32_System_Mmc" = [ "Win32_System" ]; - "Win32_System_Ole" = [ "Win32_System" ]; - "Win32_System_ParentalControls" = [ "Win32_System" ]; - "Win32_System_PasswordManagement" = [ "Win32_System" ]; - "Win32_System_Performance" = [ "Win32_System" ]; - "Win32_System_Performance_HardwareCounterProfiling" = [ "Win32_System_Performance" ]; - "Win32_System_Pipes" = [ "Win32_System" ]; - "Win32_System_Power" = [ "Win32_System" ]; - "Win32_System_ProcessStatus" = [ "Win32_System" ]; - "Win32_System_RealTimeCommunications" = [ "Win32_System" ]; - "Win32_System_Recovery" = [ "Win32_System" ]; - "Win32_System_Registry" = [ "Win32_System" ]; - "Win32_System_RemoteAssistance" = [ "Win32_System" ]; - "Win32_System_RemoteDesktop" = [ "Win32_System" ]; - "Win32_System_RemoteManagement" = [ "Win32_System" ]; - "Win32_System_RestartManager" = [ "Win32_System" ]; - "Win32_System_Restore" = [ "Win32_System" ]; - "Win32_System_Rpc" = [ "Win32_System" ]; - "Win32_System_Search" = [ "Win32_System" ]; - "Win32_System_Search_Common" = [ "Win32_System_Search" ]; - "Win32_System_SecurityCenter" = [ "Win32_System" ]; - "Win32_System_ServerBackup" = [ "Win32_System" ]; - "Win32_System_Services" = [ "Win32_System" ]; - "Win32_System_SettingsManagementInfrastructure" = [ "Win32_System" ]; - "Win32_System_SetupAndMigration" = [ "Win32_System" ]; - "Win32_System_Shutdown" = [ "Win32_System" ]; - "Win32_System_SideShow" = [ "Win32_System" ]; - "Win32_System_StationsAndDesktops" = [ "Win32_System" ]; - "Win32_System_SubsystemForLinux" = [ "Win32_System" ]; - "Win32_System_SystemInformation" = [ "Win32_System" ]; - "Win32_System_SystemServices" = [ "Win32_System" ]; - "Win32_System_TaskScheduler" = [ "Win32_System" ]; - "Win32_System_Threading" = [ "Win32_System" ]; - "Win32_System_Time" = [ "Win32_System" ]; - "Win32_System_TpmBaseServices" = [ "Win32_System" ]; - "Win32_System_TransactionServer" = [ "Win32_System" ]; - "Win32_System_UpdateAgent" = [ "Win32_System" ]; - "Win32_System_UpdateAssessment" = [ "Win32_System" ]; - "Win32_System_UserAccessLogging" = [ "Win32_System" ]; - "Win32_System_Variant" = [ "Win32_System" ]; - "Win32_System_VirtualDosMachines" = [ "Win32_System" ]; - "Win32_System_WinRT" = [ "Win32_System" ]; - "Win32_System_WinRT_AllJoyn" = [ "Win32_System_WinRT" ]; - "Win32_System_WinRT_Composition" = [ "Win32_System_WinRT" ]; - "Win32_System_WinRT_CoreInputView" = [ "Win32_System_WinRT" ]; - "Win32_System_WinRT_Direct3D11" = [ "Win32_System_WinRT" ]; - "Win32_System_WinRT_Display" = [ "Win32_System_WinRT" ]; - "Win32_System_WinRT_Graphics" = [ "Win32_System_WinRT" ]; - "Win32_System_WinRT_Graphics_Capture" = [ "Win32_System_WinRT_Graphics" ]; - "Win32_System_WinRT_Graphics_Direct2D" = [ "Win32_System_WinRT_Graphics" ]; - "Win32_System_WinRT_Graphics_Imaging" = [ "Win32_System_WinRT_Graphics" ]; - "Win32_System_WinRT_Holographic" = [ "Win32_System_WinRT" ]; - "Win32_System_WinRT_Isolation" = [ "Win32_System_WinRT" ]; - "Win32_System_WinRT_ML" = [ "Win32_System_WinRT" ]; - "Win32_System_WinRT_Media" = [ "Win32_System_WinRT" ]; - "Win32_System_WinRT_Metadata" = [ "Win32_System_WinRT" ]; - "Win32_System_WinRT_Pdf" = [ "Win32_System_WinRT" ]; - "Win32_System_WinRT_Printing" = [ "Win32_System_WinRT" ]; - "Win32_System_WinRT_Shell" = [ "Win32_System_WinRT" ]; - "Win32_System_WinRT_Storage" = [ "Win32_System_WinRT" ]; - "Win32_System_WindowsProgramming" = [ "Win32_System" ]; - "Win32_System_WindowsSync" = [ "Win32_System" ]; - "Win32_System_Wmi" = [ "Win32_System" ]; - "Win32_UI" = [ "Win32" ]; - "Win32_UI_Accessibility" = [ "Win32_UI" ]; - "Win32_UI_Animation" = [ "Win32_UI" ]; - "Win32_UI_ColorSystem" = [ "Win32_UI" ]; - "Win32_UI_Controls" = [ "Win32_UI" ]; - "Win32_UI_Controls_Dialogs" = [ "Win32_UI_Controls" ]; - "Win32_UI_Controls_RichEdit" = [ "Win32_UI_Controls" ]; - "Win32_UI_HiDpi" = [ "Win32_UI" ]; - "Win32_UI_Input" = [ "Win32_UI" ]; - "Win32_UI_Input_Ime" = [ "Win32_UI_Input" ]; - "Win32_UI_Input_Ink" = [ "Win32_UI_Input" ]; - "Win32_UI_Input_KeyboardAndMouse" = [ "Win32_UI_Input" ]; - "Win32_UI_Input_Pointer" = [ "Win32_UI_Input" ]; - "Win32_UI_Input_Radial" = [ "Win32_UI_Input" ]; - "Win32_UI_Input_Touch" = [ "Win32_UI_Input" ]; - "Win32_UI_Input_XboxController" = [ "Win32_UI_Input" ]; - "Win32_UI_InteractionContext" = [ "Win32_UI" ]; - "Win32_UI_LegacyWindowsEnvironmentFeatures" = [ "Win32_UI" ]; - "Win32_UI_Magnification" = [ "Win32_UI" ]; - "Win32_UI_Notifications" = [ "Win32_UI" ]; - "Win32_UI_Ribbon" = [ "Win32_UI" ]; - "Win32_UI_Shell" = [ "Win32_UI" ]; - "Win32_UI_Shell_Common" = [ "Win32_UI_Shell" ]; - "Win32_UI_Shell_PropertiesSystem" = [ "Win32_UI_Shell" ]; - "Win32_UI_TabletPC" = [ "Win32_UI" ]; - "Win32_UI_TextServices" = [ "Win32_UI" ]; - "Win32_UI_WindowsAndMessaging" = [ "Win32_UI" ]; - "Win32_UI_Wpf" = [ "Win32_UI" ]; - "Win32_Web" = [ "Win32" ]; - "Win32_Web_InternetExplorer" = [ "Win32_Web" ]; - "implement" = [ "windows-implement" "windows-interface" "windows-core/implement" ]; - "windows-implement" = [ "dep:windows-implement" ]; - "windows-interface" = [ "dep:windows-interface" ]; + "default" = [ "std" ]; + "std" = [ "windows-result/std" "windows-strings/std" ]; }; - resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_System" "Win32_System_SystemInformation" "default" ]; + resolvedDefaultFeatures = [ "default" "std" ]; }; - "windows-core" = rec { - crateName = "windows-core"; - version = "0.52.0"; + "windows-implement" = rec { + crateName = "windows-implement"; + version = "0.60.0"; edition = "2021"; - sha256 = "1nc3qv7sy24x0nlnb32f7alzpd6f72l4p24vl65vydbyil669ark"; - libName = "windows_core"; + sha256 = "0dm88k3hlaax85xkls4gf597ar4z8m5vzjjagzk910ph7b8xszx4"; + procMacro = true; + libName = "windows_implement"; authors = [ "Microsoft" ]; dependencies = [ { - name = "windows-targets"; - packageId = "windows-targets 0.52.6"; + name = "proc-macro2"; + packageId = "proc-macro2"; + usesDefaultFeatures = false; + } + { + name = "quote"; + packageId = "quote"; + usesDefaultFeatures = false; + } + { + name = "syn"; + packageId = "syn 2.0.100"; + usesDefaultFeatures = false; + features = [ "parsing" "proc-macro" "printing" "full" "clone-impls" ]; } ]; - features = { - }; - resolvedDefaultFeatures = [ "default" ]; + + }; + "windows-interface" = rec { + crateName = "windows-interface"; + version = "0.59.1"; + edition = "2021"; + sha256 = "1a4zr8740gyzzhq02xgl6vx8l669jwfby57xgf0zmkcdkyv134mx"; + procMacro = true; + libName = "windows_interface"; + authors = [ + "Microsoft" + ]; + dependencies = [ + { + name = "proc-macro2"; + packageId = "proc-macro2"; + usesDefaultFeatures = false; + } + { + name = "quote"; + packageId = "quote"; + usesDefaultFeatures = false; + } + { + name = "syn"; + packageId = "syn 2.0.100"; + usesDefaultFeatures = false; + features = [ "parsing" "proc-macro" "printing" "full" "clone-impls" ]; + } + ]; + }; "windows-link" = rec { crateName = "windows-link"; @@ -12449,7 +12003,7 @@ rec { } { name = "windows-strings"; - packageId = "windows-strings"; + packageId = "windows-strings 0.3.1"; usesDefaultFeatures = false; } { @@ -12484,7 +12038,7 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "windows-strings" = rec { + "windows-strings 0.3.1" = rec { crateName = "windows-strings"; version = "0.3.1"; edition = "2021"; @@ -12504,6 +12058,27 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; + "windows-strings 0.4.0" = rec { + crateName = "windows-strings"; + version = "0.4.0"; + edition = "2021"; + sha256 = "15rg6a0ha1d231wwps2qlgyqrgkyj1r8v9vsb8nlbvih4ijajavs"; + libName = "windows_strings"; + authors = [ + "Microsoft" + ]; + dependencies = [ + { + name = "windows-link"; + packageId = "windows-link"; + usesDefaultFeatures = false; + } + ]; + features = { + "default" = [ "std" ]; + }; + resolvedDefaultFeatures = [ "std" ]; + }; "windows-sys 0.52.0" = rec { crateName = "windows-sys"; version = "0.52.0"; @@ -13279,9 +12854,9 @@ rec { }; "winnow" = rec { crateName = "winnow"; - version = "0.7.4"; + version = "0.7.6"; edition = "2021"; - sha256 = "0dmbsz6zfddcgsqzzqxw1h8f7zy19x407g7zl3hyp6vf2m2bb5qf"; + sha256 = "047abhm7qqgc32pf9a2arini5wsrx7p9wsbx3s106jx4pgczrlv3"; dependencies = [ { name = "memchr"; @@ -13299,6 +12874,25 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; + "wit-bindgen-rt" = rec { + crateName = "wit-bindgen-rt"; + version = "0.39.0"; + edition = "2021"; + sha256 = "1hd65pa5hp0nl664m94bg554h4zlhrzmkjsf6lsgsb7yc4734hkg"; + libName = "wit_bindgen_rt"; + dependencies = [ + { + name = "bitflags"; + packageId = "bitflags"; + optional = true; + } + ]; + features = { + "async" = [ "dep:futures" "dep:once_cell" ]; + "bitflags" = [ "dep:bitflags" ]; + }; + resolvedDefaultFeatures = [ "bitflags" ]; + }; "write16" = rec { crateName = "write16"; version = "1.0.0"; @@ -13324,10 +12918,10 @@ rec { }; "xml-rs" = rec { crateName = "xml-rs"; - version = "0.8.25"; + version = "0.8.26"; edition = "2021"; crateBin = []; - sha256 = "1i73ajf6scni5bi1a51r19xykgrambdx5fkks0fyg5jqqbml1ff5"; + sha256 = "1nkbzksai36pvx3ag1fn9b5cffwb1ldl66aglwcip42nkdnyfb56"; libName = "xml"; authors = [ "Vladimir Matveev " diff --git a/Cargo.toml b/Cargo.toml index 53dc630b..63b61e54 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,9 +11,7 @@ repository = "https://github.com/stackabletech/superset-operator" [workspace.dependencies] product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" } -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.90.0" } -stackable-telemetry = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-telemetry-0.4.0" } -stackable-versioned = { git = "https://github.com/stackabletech/operator-rs.git", features = ["k8s"], tag = "stackable-versioned-0.7.1" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.91.1" } anyhow = "1.0" built = { version = "0.7", features = ["chrono", "git2"] } diff --git a/crate-hashes.json b/crate-hashes.json index c8a9703a..e4629311 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,10 +1,10 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.90.0#stackable-operator-derive@0.3.1": "0fclvpxhchykqd7bl8hscr4v06mbs2v5vjp0xv27nvqr94j63xs2", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.90.0#stackable-operator@0.90.0": "0fclvpxhchykqd7bl8hscr4v06mbs2v5vjp0xv27nvqr94j63xs2", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.90.0#stackable-shared@0.0.1": "0fclvpxhchykqd7bl8hscr4v06mbs2v5vjp0xv27nvqr94j63xs2", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-telemetry-0.4.0#stackable-telemetry@0.4.0": "0hcm64fb2ngyalq8rci5lrr881prg023pq9cd1sfr79iynbr6a26", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.1#k8s-version@0.1.2": "16klfwx3kz3ys7afwjicfj8msws9a718izx09jspwwpff3rl6wsi", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.1#stackable-versioned-macros@0.7.1": "16klfwx3kz3ys7afwjicfj8msws9a718izx09jspwwpff3rl6wsi", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.1#stackable-versioned@0.7.1": "16klfwx3kz3ys7afwjicfj8msws9a718izx09jspwwpff3rl6wsi", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.1#k8s-version@0.1.2": "11zqwlwvfigca7lfsdch1wqd3vl694hff1avf6rhiawpnassj2cw", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.1#stackable-operator-derive@0.3.1": "11zqwlwvfigca7lfsdch1wqd3vl694hff1avf6rhiawpnassj2cw", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.1#stackable-operator@0.91.1": "11zqwlwvfigca7lfsdch1wqd3vl694hff1avf6rhiawpnassj2cw", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.1#stackable-shared@0.0.1": "11zqwlwvfigca7lfsdch1wqd3vl694hff1avf6rhiawpnassj2cw", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.1#stackable-telemetry@0.5.0": "11zqwlwvfigca7lfsdch1wqd3vl694hff1avf6rhiawpnassj2cw", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.1#stackable-versioned-macros@0.7.1": "11zqwlwvfigca7lfsdch1wqd3vl694hff1avf6rhiawpnassj2cw", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.1#stackable-versioned@0.7.1": "11zqwlwvfigca7lfsdch1wqd3vl694hff1avf6rhiawpnassj2cw", "git+https://github.com/stackabletech/product-config.git?tag=0.7.0#product-config@0.7.0": "0gjsm80g6r75pm3824dcyiz4ysq1ka4c1if6k1mjm9cnd5ym0gny" } \ No newline at end of file diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml index 93e300ee..bfd455e9 100644 --- a/rust/operator-binary/Cargo.toml +++ b/rust/operator-binary/Cargo.toml @@ -11,8 +11,6 @@ publish = false [dependencies] product-config.workspace = true stackable-operator.workspace = true -stackable-telemetry.workspace = true -stackable-versioned.workspace = true anyhow.workspace = true clap.workspace = true diff --git a/rust/operator-binary/src/crd/authentication.rs b/rust/operator-binary/src/crd/authentication.rs index 1f62bfe3..f99fb1d2 100644 --- a/rust/operator-binary/src/crd/authentication.rs +++ b/rust/operator-binary/src/crd/authentication.rs @@ -9,8 +9,8 @@ use stackable_operator::{ oidc::{self, IdentityProviderHint}, }, schemars::{self, JsonSchema}, + versioned::versioned, }; -use stackable_versioned::versioned; use tracing::info; // The assumed OIDC provider if no hint is given in the AuthClass diff --git a/rust/operator-binary/src/crd/druidconnection.rs b/rust/operator-binary/src/crd/druidconnection.rs index bce8964c..c795cbf4 100644 --- a/rust/operator-binary/src/crd/druidconnection.rs +++ b/rust/operator-binary/src/crd/druidconnection.rs @@ -4,8 +4,8 @@ use stackable_operator::{ k8s_openapi::{apimachinery::pkg::apis::meta::v1::Time, chrono::Utc}, kube::{CustomResource, ResourceExt}, schemars::{self, JsonSchema}, + versioned::versioned, }; -use stackable_versioned::versioned; #[derive(Snafu, Debug)] pub enum Error { diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs index a9174afb..31eb9b70 100644 --- a/rust/operator-binary/src/crd/mod.rs +++ b/rust/operator-binary/src/crd/mod.rs @@ -29,8 +29,8 @@ use stackable_operator::{ schemars::{self, JsonSchema}, status::condition::{ClusterCondition, HasStatusCondition}, time::Duration, + versioned::versioned, }; -use stackable_versioned::versioned; use strum::{Display, EnumIter, EnumString, IntoEnumIterator}; pub mod affinity; diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs index 52ffdeed..7cbef3c2 100644 --- a/rust/operator-binary/src/main.rs +++ b/rust/operator-binary/src/main.rs @@ -1,10 +1,10 @@ -use std::{ops::Deref as _, sync::Arc}; +use std::sync::Arc; use clap::Parser; use futures::{StreamExt, pin_mut}; use stackable_operator::{ YamlSchema, - cli::{Command, ProductOperatorRun, RollingPeriod}, + cli::{Command, ProductOperatorRun}, commons::authentication::AuthenticationClass, k8s_openapi::api::{ apps::v1::StatefulSet, @@ -23,9 +23,8 @@ use stackable_operator::{ }, logging::controller::report_controller_reconciled, shared::yaml::SerializeOptions, + telemetry::Tracing, }; -use stackable_telemetry::{Tracing, tracing::settings::Settings}; -use tracing::level_filters::LevelFilter; use crate::{ crd::{ @@ -56,9 +55,6 @@ mod built_info { pub const APP_PORT: u16 = 8088; pub const OPERATOR_NAME: &str = "superset.stackable.tech"; -// TODO (@NickLarsenNZ): Change the variable to `CONSOLE_LOG` -pub const ENV_VAR_CONSOLE_LOG: &str = "SUPERSET_OPERATOR_LOG"; - #[derive(Parser)] #[clap(about, author)] struct Opts { @@ -82,43 +78,12 @@ async fn main() -> anyhow::Result<()> { telemetry_arguments, cluster_info_opts, }) => { - let _tracing_guard = Tracing::builder() - .service_name("superset-operator") - .with_console_output(( - ENV_VAR_CONSOLE_LOG, - LevelFilter::INFO, - !telemetry_arguments.no_console_output, - )) - // NOTE (@NickLarsenNZ): Before stackable-telemetry was used, the log directory was - // set via an env: `SUPERSET_OPERATOR_LOG_DIRECTORY`. - // See: https://github.com/stackabletech/operator-rs/blob/f035997fca85a54238c8de895389cc50b4d421e2/crates/stackable-operator/src/logging/mod.rs#L40 - // Now it will be `ROLLING_LOGS` (or via `--rolling-logs `). - .with_file_output(telemetry_arguments.rolling_logs.map(|log_directory| { - let rotation_period = telemetry_arguments - .rolling_logs_period - .unwrap_or(RollingPeriod::Never) - .deref() - .clone(); - - Settings::builder() - .with_environment_variable(ENV_VAR_CONSOLE_LOG) - .with_default_level(LevelFilter::INFO) - .file_log_settings_builder(log_directory, "tracing-rs.json") - .with_rotation_period(rotation_period) - .build() - })) - .with_otlp_log_exporter(( - "OTLP_LOG", - LevelFilter::DEBUG, - telemetry_arguments.otlp_logs, - )) - .with_otlp_trace_exporter(( - "OTLP_TRACE", - LevelFilter::DEBUG, - telemetry_arguments.otlp_traces, - )) - .build() - .init()?; + // NOTE (@NickLarsenNZ): Before stackable-telemetry was used: + // - The console log level was set by `SUPERSET_OPERATOR_LOG`, and is now `CONSOLE_LOG` (when using Tracing::pre_configured). + // - The file log level was set by `SUPERSET_OPERATOR_LOG`, and is now set via `FILE_LOG` (when using Tracing::pre_configured). + // - The file log directory was set by `SUPERSET_OPERATOR_LOG_DIRECTORY`, and is now set by `ROLLING_LOGS_DIR` (or via `--rolling-logs `). + let _tracing_guard = + Tracing::pre_configured(built_info::PKG_NAME, telemetry_arguments).init()?; tracing::info!( built_info.pkg_version = built_info::PKG_VERSION,