diff --git a/CHANGELOG.md b/CHANGELOG.md index aab6611c..73c84f2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,15 @@ - BREAKING: The file log directory was set by `AIRFLOW_OPERATOR_LOG_DIRECTORY`, and is now set by `ROLLING_LOGS` (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 ([#600]). ### Fixed - Use `json` file extension for log files ([#607]). +- Fix a bug where changes to ConfigMaps that are referenced in the AirflowCluster spec didn't trigger a reconciliation ([#600]). +[#600]: https://github.com/stackabletech/airflow-operator/pull/600 [#601]: https://github.com/stackabletech/airflow-operator/pull/601 [#607]: https://github.com/stackabletech/airflow-operator/pull/607 diff --git a/Cargo.lock b/Cargo.lock index c3f55475..ae12f6c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", @@ -2668,8 +2668,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.89.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.89.1#cd73728af410c52972b9a9a3ba1302bcdb574d04" +version = "0.90.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.90.0#ea063b4595caa20c82d37c595487c76476c9ab10" dependencies = [ "chrono", "clap", @@ -2704,7 +2704,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.89.1#cd73728af410c52972b9a9a3ba1302bcdb574d04" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.90.0#ea063b4595caa20c82d37c595487c76476c9ab10" dependencies = [ "darling", "proc-macro2", @@ -2715,7 +2715,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.89.1#cd73728af410c52972b9a9a3ba1302bcdb574d04" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.90.0#ea063b4595caa20c82d37c595487c76476c9ab10" dependencies = [ "kube", "semver", @@ -3710,9 +3710,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 eb024b05..ee189b08 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -149,7 +149,7 @@ rec { } { name = "getrandom"; - packageId = "getrandom"; + packageId = "getrandom 0.2.15"; optional = true; } { @@ -466,9 +466,9 @@ rec { }; "async-trait" = rec { crateName = "async-trait"; - version = "0.1.87"; + version = "0.1.88"; edition = "2021"; - sha256 = "15swwmyl4nx7w03rq6ibb4x2c8rzbx9fpiag1kn4fhapb49yqmnm"; + sha256 = "1dgxvz7g75cmz6vqqz0mri4xazc6a8xfj1db6r9fxz29lzyd6fg5"; procMacro = true; libName = "async_trait"; authors = [ @@ -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"; @@ -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 " @@ -1873,9 +1873,9 @@ rec { }; "deranged" = rec { crateName = "deranged"; - version = "0.3.11"; + version = "0.4.0"; edition = "2021"; - sha256 = "1d1ibqqnr5qdrpw8rclwrf1myn3wf0dygl04idf4j2s49ah6yaxl"; + sha256 = "13h6skwk411wzhf1l9l7d3yz5y6vg9d7s3dwhhb4a942r88nm7lw"; authors = [ "Jacob Pratt " ]; @@ -1889,10 +1889,13 @@ rec { ]; features = { "default" = [ "std" ]; + "macros" = [ "dep:deranged-macros" ]; "num" = [ "dep:num-traits" ]; "powerfmt" = [ "dep:powerfmt" ]; "quickcheck" = [ "dep:quickcheck" "alloc" ]; - "rand" = [ "dep:rand" ]; + "rand" = [ "rand08" "rand09" ]; + "rand08" = [ "dep:rand08" ]; + "rand09" = [ "dep:rand09" ]; "serde" = [ "dep:serde" ]; "std" = [ "alloc" ]; }; @@ -2208,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 " @@ -2229,6 +2232,7 @@ rec { features = { "default" = [ "std" ]; "loom" = [ "event-listener/loom" ]; + "portable-atomic" = [ "event-listener/portable-atomic" ]; "std" = [ "event-listener/std" ]; }; resolvedDefaultFeatures = [ "default" "std" ]; @@ -2349,9 +2353,9 @@ rec { }; "foldhash" = rec { crateName = "foldhash"; - version = "0.1.4"; + version = "0.1.5"; edition = "2021"; - sha256 = "0vsxw2iwpgs7yy6l7pndm7b8nllaq5vdxwnmjn1qpm5kyzhzvlm0"; + sha256 = "1wisr1xlc2bj7hk4rgkcjkz3j2x4dhd1h9lwk7mj8p71qpdgbi6r"; authors = [ "Orson Peters " ]; @@ -2721,7 +2725,7 @@ rec { }; resolvedDefaultFeatures = [ "more_lengths" ]; }; - "getrandom" = rec { + "getrandom 0.2.15" = rec { crateName = "getrandom"; version = "0.2.15"; edition = "2018"; @@ -2742,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); } @@ -2757,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"; @@ -2776,9 +2860,9 @@ rec { }; "git2" = rec { crateName = "git2"; - version = "0.20.0"; + version = "0.20.1"; edition = "2018"; - sha256 = "1zwav0r76njd9chqxh7wj4r4zfn08nzsisrg05liyd6cjf4piniz"; + sha256 = "1fgf67h78yrw2gm1n8ghgr0jwsbkvmjfhnbng9zrm2n68jxbh82j"; authors = [ "Josh Triplett " "Alex Crichton " @@ -2900,7 +2984,7 @@ rec { } { name = "indexmap"; - packageId = "indexmap 2.8.0"; + packageId = "indexmap 2.9.0"; features = [ "std" ]; } { @@ -3085,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"; @@ -3103,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 = { @@ -3584,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 " @@ -3618,6 +3697,11 @@ rec { name = "hyper"; packageId = "hyper"; } + { + name = "libc"; + packageId = "libc"; + optional = true; + } { name = "pin-project-lite"; packageId = "pin-project-lite"; @@ -3665,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" ]; @@ -3674,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 " @@ -3697,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"; @@ -3709,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"; @@ -3881,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" ]; @@ -3971,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" ]; @@ -4042,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" ]; @@ -4238,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"; @@ -4363,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"; @@ -5196,10 +5292,10 @@ rec { }; "libgit2-sys" = rec { crateName = "libgit2-sys"; - version = "0.18.0+1.9.0"; + version = "0.18.1+1.9.0"; edition = "2018"; links = "git2"; - sha256 = "1v7zcw1kky338grxs70y7fwpy70g846bpa5yzvl9f5bybr31g8g1"; + sha256 = "03i98nb84aa99bn7sxja11pllq6fghsaw4d3qwjxikgzhh7v5p71"; libName = "libgit2_sys"; libPath = "lib.rs"; authors = [ @@ -5240,10 +5336,10 @@ rec { }; "libz-sys" = rec { crateName = "libz-sys"; - version = "1.1.21"; + version = "1.1.22"; edition = "2018"; links = "z"; - sha256 = "1ajfpf413j9m7kmf4fwvvgv5jxxm5s438f2pfbv2c2vf1vjni6yz"; + sha256 = "07b5wxh0ska996kc0g2hanjhmb4di7ksm6ndljhr4pi0vykyfw4b"; libName = "libz_sys"; authors = [ "Alex Crichton " @@ -5327,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" ]; @@ -5420,9 +5516,9 @@ rec { }; "miniz_oxide" = rec { crateName = "miniz_oxide"; - version = "0.8.5"; + version = "0.8.7"; edition = "2021"; - sha256 = "1r9whkc61xri7m1cn4rjrjlhr32ab29nvfxcbg0ri5mmpgg08glf"; + sha256 = "0c4lj692adnzw0h9j8l24d7imds3icpgdkk3b03zlhxf90zcww7z"; authors = [ "Frommi " "oyvindln " @@ -5441,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" ]; }; @@ -5474,7 +5571,7 @@ rec { } { name = "wasi"; - packageId = "wasi"; + packageId = "wasi 0.11.0+wasi-snapshot-preview1"; target = { target, features }: ("wasi" == target."os" or null); } { @@ -5588,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 " ]; @@ -6213,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 " ]; @@ -6247,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 " @@ -6276,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 " ]; @@ -6315,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 " ]; @@ -6438,7 +6535,7 @@ rec { dependencies = [ { name = "zerocopy"; - packageId = "zerocopy 0.8.23"; + packageId = "zerocopy 0.8.24"; features = [ "simd" ]; } ]; @@ -6631,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"; @@ -6717,7 +6827,7 @@ rec { dependencies = [ { name = "getrandom"; - packageId = "getrandom"; + packageId = "getrandom 0.2.15"; optional = true; } ]; @@ -6731,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 " @@ -7199,7 +7309,7 @@ rec { } { name = "getrandom"; - packageId = "getrandom"; + packageId = "getrandom 0.2.15"; } { name = "libc"; @@ -7375,9 +7485,9 @@ rec { }; "rustls" = rec { crateName = "rustls"; - version = "0.23.23"; + version = "0.23.25"; edition = "2021"; - sha256 = "15gk2bmry78cps3ya38a7cn4jxc36xv1r7gndr0fbz40qjc6qya7"; + sha256 = "0g5idwxm04i71k3n66ml30zyfbgv6p85a7jky2i09v64i8cfjbl2"; dependencies = [ { name = "log"; @@ -7426,10 +7536,10 @@ rec { ]; features = { "aws-lc-rs" = [ "aws_lc_rs" ]; - "aws_lc_rs" = [ "dep:aws-lc-rs" "webpki/aws_lc_rs" ]; + "aws_lc_rs" = [ "dep:aws-lc-rs" "webpki/aws-lc-rs" "aws-lc-rs/aws-lc-sys" "aws-lc-rs/prebuilt-nasm" ]; "brotli" = [ "dep:brotli" "dep:brotli-decompressor" "std" ]; "default" = [ "aws_lc_rs" "logging" "std" "tls12" ]; - "fips" = [ "aws_lc_rs" "aws-lc-rs?/fips" ]; + "fips" = [ "aws_lc_rs" "aws-lc-rs?/fips" "webpki/aws-lc-rs-fips" ]; "hashbrown" = [ "dep:hashbrown" ]; "log" = [ "dep:log" ]; "logging" = [ "log" ]; @@ -7542,9 +7652,9 @@ rec { }; "rustls-webpki" = rec { crateName = "rustls-webpki"; - version = "0.102.8"; + version = "0.103.1"; edition = "2021"; - sha256 = "1sdy8ks86b7jpabpnb2px2s7f1sq8v0nqf6fnlvwzm4vfk41pjk4"; + sha256 = "00rcdz0rb9ia2ivrq7412ry9qkvbh78pra2phl4p7kxck9vbiy7y"; libName = "webpki"; dependencies = [ { @@ -7566,8 +7676,9 @@ rec { ]; features = { "alloc" = [ "ring?/alloc" "pki-types/alloc" ]; - "aws_lc_rs" = [ "dep:aws-lc-rs" ]; - "default" = [ "std" "ring" ]; + "aws-lc-rs" = [ "dep:aws-lc-rs" "aws-lc-rs/aws-lc-sys" "aws-lc-rs/prebuilt-nasm" ]; + "aws-lc-rs-fips" = [ "dep:aws-lc-rs" "aws-lc-rs/fips" ]; + "default" = [ "std" ]; "ring" = [ "dep:ring" ]; "std" = [ "alloc" "pki-types/std" ]; }; @@ -8109,7 +8220,7 @@ rec { dependencies = [ { name = "indexmap"; - packageId = "indexmap 2.8.0"; + packageId = "indexmap 2.9.0"; } { name = "itoa"; @@ -8285,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" ]; }; @@ -8429,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 " @@ -8578,13 +8692,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.89.1"; + version = "0.90.0"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "cd73728af410c52972b9a9a3ba1302bcdb574d04"; - sha256 = "1hrxrybc6197ibx0m2wfxlg5pdg4hanf6xvslzrhsp77a04pb0y9"; + rev = "ea063b4595caa20c82d37c595487c76476c9ab10"; + sha256 = "0fclvpxhchykqd7bl8hscr4v06mbs2v5vjp0xv27nvqr94j63xs2"; }; libName = "stackable_operator"; authors = [ @@ -8629,7 +8743,7 @@ rec { } { name = "indexmap"; - packageId = "indexmap 2.8.0"; + packageId = "indexmap 2.9.0"; } { name = "json-patch"; @@ -8729,8 +8843,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "cd73728af410c52972b9a9a3ba1302bcdb574d04"; - sha256 = "1hrxrybc6197ibx0m2wfxlg5pdg4hanf6xvslzrhsp77a04pb0y9"; + rev = "ea063b4595caa20c82d37c595487c76476c9ab10"; + sha256 = "0fclvpxhchykqd7bl8hscr4v06mbs2v5vjp0xv27nvqr94j63xs2"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -8764,8 +8878,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "cd73728af410c52972b9a9a3ba1302bcdb574d04"; - sha256 = "1hrxrybc6197ibx0m2wfxlg5pdg4hanf6xvslzrhsp77a04pb0y9"; + rev = "ea063b4595caa20c82d37c595487c76476c9ab10"; + sha256 = "0fclvpxhchykqd7bl8hscr4v06mbs2v5vjp0xv27nvqr94j63xs2"; }; libName = "stackable_shared"; authors = [ @@ -9301,9 +9415,9 @@ rec { }; "time" = rec { crateName = "time"; - version = "0.3.39"; + version = "0.3.41"; edition = "2021"; - sha256 = "1n6dmsj2xpk9jksdg4im5x0chz6vpqypxdl08nn3m8j03aq9ilns"; + sha256 = "0h0cpiyya8cjlrh00d2r72bmgg4lsdcncs76qpwy0rn2kghijxla"; authors = [ "Jacob Pratt " "Time contributors" @@ -9381,9 +9495,9 @@ rec { }; "time-core" = rec { crateName = "time-core"; - version = "0.1.3"; + version = "0.1.4"; edition = "2021"; - sha256 = "1vvn3vskn3dnvql1s0pvdlxazrjgvhksjzy2gcfw3dw5p6jrfp3n"; + sha256 = "0z5h9fknvdvbs2k2s1chpi3ab3jvgkfhdnqwrvixjngm263s7sf9"; libName = "time_core"; authors = [ "Jacob Pratt " @@ -9393,9 +9507,9 @@ rec { }; "time-macros" = rec { crateName = "time-macros"; - version = "0.2.20"; + version = "0.2.22"; edition = "2021"; - sha256 = "0p2w00wawnr2nzpdyi6a8mg5m6kcs0crdq4xhzvwafqwx31kn2g8"; + sha256 = "0jcaxpw220han2bzbrdlpqhy1s5k9i8ri3lw6n5zv4zcja9p69im"; procMacro = true; libName = "time_macros"; authors = [ @@ -9447,9 +9561,9 @@ rec { }; "tokio" = rec { crateName = "tokio"; - version = "1.44.1"; + version = "1.44.2"; edition = "2021"; - sha256 = "06n90q5hh1yd844s6nf4j3fwbrkm2bnq533kp3a488l4bdhxm0pk"; + sha256 = "0j4w3qvlcqzgbxlnap0czvspqj6x461vyk1sbqcf97g4rci8if76"; authors = [ "Tokio Contributors " ]; @@ -9740,7 +9854,7 @@ rec { dependencies = [ { name = "indexmap"; - packageId = "indexmap 2.8.0"; + packageId = "indexmap 2.9.0"; features = [ "std" ]; } { @@ -10932,7 +11046,7 @@ rec { ]; }; - "wasi" = rec { + "wasi 0.11.0+wasi-snapshot-preview1" = rec { crateName = "wasi"; version = "0.11.0+wasi-snapshot-preview1"; edition = "2018"; @@ -10949,6 +11063,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"; @@ -11712,711 +11849,113 @@ 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"; - version = "0.1.0"; + version = "0.1.1"; edition = "2021"; - sha256 = "1qr0srnkw148wbrws3726pm640h2vxgcdlxn0cxpbcg27irzvk3d"; + sha256 = "0f2cq7imbrppsmmnz8899hfhg07cp5gq6rh0bjhb1qb6nwshk13n"; libName = "windows_link"; authors = [ "Microsoft" @@ -12440,7 +11979,7 @@ rec { } { name = "windows-strings"; - packageId = "windows-strings"; + packageId = "windows-strings 0.3.1"; usesDefaultFeatures = false; } { @@ -12456,9 +11995,9 @@ rec { }; "windows-result" = rec { crateName = "windows-result"; - version = "0.3.1"; + version = "0.3.2"; edition = "2021"; - sha256 = "12dihsnl408sjjlyairc8vwjig68dvlfc00mi17pxawghpz4wdq6"; + sha256 = "0li2f76anf0rg7i966d9qs5iprsg555g9rgyzj7gcpfr9wdd2ky6"; libName = "windows_result"; authors = [ "Microsoft" @@ -12467,6 +12006,7 @@ rec { { name = "windows-link"; packageId = "windows-link"; + usesDefaultFeatures = false; } ]; features = { @@ -12474,7 +12014,7 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "windows-strings" = rec { + "windows-strings 0.3.1" = rec { crateName = "windows-strings"; version = "0.3.1"; edition = "2021"; @@ -12494,6 +12034,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"; @@ -13269,9 +12830,9 @@ rec { }; "winnow" = rec { crateName = "winnow"; - version = "0.7.4"; + version = "0.7.6"; edition = "2021"; - sha256 = "0dmbsz6zfddcgsqzzqxw1h8f7zy19x407g7zl3hyp6vf2m2bb5qf"; + sha256 = "047abhm7qqgc32pf9a2arini5wsrx7p9wsbx3s106jx4pgczrlv3"; dependencies = [ { name = "memchr"; @@ -13289,6 +12850,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"; @@ -13440,11 +13020,11 @@ rec { }; resolvedDefaultFeatures = [ "simd" ]; }; - "zerocopy 0.8.23" = rec { + "zerocopy 0.8.24" = rec { crateName = "zerocopy"; - version = "0.8.23"; + version = "0.8.24"; edition = "2021"; - sha256 = "1inbxgqhsxghawsss8x8517g30fpp8s3ll2ywy88ncm40m6l95zx"; + sha256 = "0yb8hyzfnwzr2wg4p7cnqmjps8fsw8xqnprafgpmfs8qisigx1i5"; authors = [ "Joshua Liebow-Feeser " "Jack Wrenn " @@ -13452,19 +13032,19 @@ rec { dependencies = [ { name = "zerocopy-derive"; - packageId = "zerocopy-derive 0.8.23"; + packageId = "zerocopy-derive 0.8.24"; optional = true; } { name = "zerocopy-derive"; - packageId = "zerocopy-derive 0.8.23"; + packageId = "zerocopy-derive 0.8.24"; target = { target, features }: false; } ]; devDependencies = [ { name = "zerocopy-derive"; - packageId = "zerocopy-derive 0.8.23"; + packageId = "zerocopy-derive 0.8.24"; } ]; features = { @@ -13502,11 +13082,11 @@ rec { ]; }; - "zerocopy-derive 0.8.23" = rec { + "zerocopy-derive 0.8.24" = rec { crateName = "zerocopy-derive"; - version = "0.8.23"; + version = "0.8.24"; edition = "2021"; - sha256 = "0m7iwisxz111sgkski722nyxv0rixbs0a9iylrcvhpfx1qfw0lk3"; + sha256 = "1gk9047pbq1yjj2jyiv0s37nqc53maqbmhcsjp6lhi2w7kvai5m9"; procMacro = true; libName = "zerocopy_derive"; authors = [ diff --git a/Cargo.toml b/Cargo.toml index ca0b9dc8..36bebd2e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/stackabletech/airflow-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.89.1" } +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" } diff --git a/crate-hashes.json b/crate-hashes.json index 0460dbd5..c8a9703a 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,7 +1,7 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.89.1#stackable-operator-derive@0.3.1": "1hrxrybc6197ibx0m2wfxlg5pdg4hanf6xvslzrhsp77a04pb0y9", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.89.1#stackable-operator@0.89.1": "1hrxrybc6197ibx0m2wfxlg5pdg4hanf6xvslzrhsp77a04pb0y9", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.89.1#stackable-shared@0.0.1": "1hrxrybc6197ibx0m2wfxlg5pdg4hanf6xvslzrhsp77a04pb0y9", + "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", diff --git a/rust/operator-binary/src/airflow_controller.rs b/rust/operator-binary/src/airflow_controller.rs index 954afe31..7ce18f92 100644 --- a/rust/operator-binary/src/airflow_controller.rs +++ b/rust/operator-binary/src/airflow_controller.rs @@ -95,7 +95,7 @@ use crate::{ }, pdb::add_pdbs, }, - product_logging::{extend_config_map_with_log_config, resolve_vector_aggregator_address}, + product_logging::extend_config_map_with_log_config, }; pub const AIRFLOW_CONTROLLER_NAME: &str = "airflowcluster"; @@ -229,10 +229,8 @@ pub enum Error { source: stackable_operator::cluster_resources::Error, }, - #[snafu(display("failed to resolve the Vector aggregator address"))] - ResolveVectorAggregatorAddress { - source: crate::product_logging::Error, - }, + #[snafu(display("vector agent is enabled but vector aggregator ConfigMap is missing"))] + VectorAggregatorConfigMapMissing, #[snafu(display("failed to add the logging configuration to the ConfigMap [{cm_name}]"))] InvalidLoggingConfig { @@ -398,18 +396,6 @@ pub async fn reconcile_airflow( ) .context(InvalidProductConfigSnafu)?; - let vector_aggregator_address = resolve_vector_aggregator_address( - client, - airflow, - airflow - .spec - .cluster_config - .vector_aggregator_config_map_name - .as_deref(), - ) - .await - .context(ResolveVectorAggregatorAddressSnafu)?; - let mut cluster_resources = ClusterResources::new( APP_NAME, OPERATOR_NAME, @@ -451,7 +437,6 @@ pub async fn reconcile_airflow( &resolved_product_image, &authentication_config, &authorization_config, - &vector_aggregator_address, &mut cluster_resources, client, &rbac_sa, @@ -523,7 +508,6 @@ pub async fn reconcile_airflow( &authentication_config, &authorization_config, &merged_airflow_config.logging, - vector_aggregator_address.as_deref(), &Container::Airflow, )?; cluster_resources @@ -572,7 +556,6 @@ async fn build_executor_template( resolved_product_image: &ResolvedProductImage, authentication_config: &AirflowClientAuthenticationDetailsResolved, authorization_config: &AirflowAuthorizationResolved, - vector_aggregator_address: &Option, cluster_resources: &mut ClusterResources, client: &stackable_operator::client::Client, rbac_sa: &stackable_operator::k8s_openapi::api::core::v1::ServiceAccount, @@ -594,7 +577,6 @@ async fn build_executor_template( authentication_config, authorization_config, &merged_executor_config.logging, - vector_aggregator_address.as_deref(), &Container::Base, )?; cluster_resources @@ -692,7 +674,6 @@ fn build_rolegroup_config_map( authentication_config: &AirflowClientAuthenticationDetailsResolved, authorization_config: &AirflowAuthorizationResolved, logging: &Logging, - vector_aggregator_address: Option<&str>, container: &Container, ) -> Result { let mut config: BTreeMap = BTreeMap::new(); @@ -776,7 +757,6 @@ fn build_rolegroup_config_map( extend_config_map_with_log_config( rolegroup, - vector_aggregator_address, logging, container, &Container::Vector, @@ -1079,15 +1059,26 @@ fn build_server_rolegroup_statefulset( } if merged_airflow_config.logging.enable_vector_agent { - pb.add_container(build_logging_container( - resolved_product_image, - merged_airflow_config - .logging - .containers - .get(&Container::Vector), - )?); + match &airflow + .spec + .cluster_config + .vector_aggregator_config_map_name + { + Some(vector_aggregator_config_map_name) => { + pb.add_container(build_logging_container( + resolved_product_image, + merged_airflow_config + .logging + .containers + .get(&Container::Vector), + vector_aggregator_config_map_name, + )?); + } + None => { + VectorAggregatorConfigMapMissingSnafu.fail()?; + } + } } - let mut pod_template = pb.build_template(); pod_template.merge_from(role.config.pod_overrides.clone()); if let Some(rolegroup) = rolegroup { @@ -1142,6 +1133,7 @@ fn build_server_rolegroup_statefulset( fn build_logging_container( resolved_product_image: &ResolvedProductImage, log_config: Option<&ContainerLogConfig>, + vector_aggregator_config_map_name: &str, ) -> Result { product_logging::framework::vector_container( resolved_product_image, @@ -1154,6 +1146,7 @@ fn build_logging_container( .with_memory_request("128Mi") .with_memory_limit("128Mi") .build(), + vector_aggregator_config_map_name, ) .context(ConfigureLoggingSnafu) } @@ -1255,13 +1248,25 @@ fn build_executor_template_config_map( } if merged_executor_config.logging.enable_vector_agent { - pb.add_container(build_logging_container( - resolved_product_image, - merged_executor_config - .logging - .containers - .get(&Container::Vector), - )?); + match &airflow + .spec + .cluster_config + .vector_aggregator_config_map_name + { + Some(vector_aggregator_config_map_name) => { + pb.add_container(build_logging_container( + resolved_product_image, + merged_executor_config + .logging + .containers + .get(&Container::Vector), + vector_aggregator_config_map_name, + )?); + } + None => { + VectorAggregatorConfigMapMissingSnafu.fail()?; + } + } } let mut pod_template = pb.build_template(); diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs index 950475e8..904cf83a 100644 --- a/rust/operator-binary/src/main.rs +++ b/rust/operator-binary/src/main.rs @@ -6,7 +6,10 @@ use stackable_operator::{ YamlSchema, cli::{Command, ProductOperatorRun, RollingPeriod}, commons::authentication::AuthenticationClass, - k8s_openapi::api::{apps::v1::StatefulSet, core::v1::Service}, + k8s_openapi::api::{ + apps::v1::StatefulSet, + core::v1::{ConfigMap, Service}, + }, kube::{ ResourceExt, core::DeserializeGuard, @@ -135,7 +138,8 @@ async fn main() -> anyhow::Result<()> { watcher::Config::default(), ); - let airflow_store_1 = airflow_controller.store(); + let authentication_class_store = airflow_controller.store(); + let config_map_store = airflow_controller.store(); airflow_controller .owns( watch_namespace.get_api::(&client), @@ -150,7 +154,7 @@ async fn main() -> anyhow::Result<()> { client.get_api::>(&()), watcher::Config::default(), move |authentication_class| { - airflow_store_1 + authentication_class_store .state() .into_iter() .filter( @@ -161,6 +165,17 @@ async fn main() -> anyhow::Result<()> { .map(|airflow| ObjectRef::from_obj(&*airflow)) }, ) + .watches( + watch_namespace.get_api::>(&client), + watcher::Config::default(), + move |config_map| { + config_map_store + .state() + .into_iter() + .filter(move |airflow| references_config_map(airflow, &config_map)) + .map(|airflow| ObjectRef::from_obj(&*airflow)) + }, + ) .run( airflow_controller::reconcile_airflow, airflow_controller::error_policy, @@ -209,3 +224,20 @@ fn references_authentication_class( .iter() .any(|c| c.common.authentication_class_name() == &authentication_class_name) } + +fn references_config_map( + airflow: &DeserializeGuard, + config_map: &DeserializeGuard, +) -> bool { + let Ok(airflow) = &airflow.0 else { + return false; + }; + // Check for ConfigMaps that are referenced by the spec and not directly attached to a Pod + match &airflow.spec.cluster_config.authorization { + Some(airflow_authorization) => match &airflow_authorization.opa { + Some(opa_config) => opa_config.opa.config_map_name == config_map.name_any(), + None => false, + }, + None => false, + } +} diff --git a/rust/operator-binary/src/product_logging.rs b/rust/operator-binary/src/product_logging.rs index 3d8fe9cb..9aca3ec3 100644 --- a/rust/operator-binary/src/product_logging.rs +++ b/rust/operator-binary/src/product_logging.rs @@ -1,10 +1,8 @@ use std::fmt::{Display, Write}; -use snafu::{OptionExt, ResultExt, Snafu}; +use snafu::Snafu; use stackable_operator::{ builder::configmap::ConfigMapBuilder, - client::Client, - k8s_openapi::api::core::v1::ConfigMap, kube::Resource, product_logging::{ self, @@ -37,47 +35,12 @@ pub enum Error { type Result = std::result::Result; -const VECTOR_AGGREGATOR_CM_ENTRY: &str = "ADDRESS"; const LOG_CONFIG_FILE: &str = "log_config.py"; const LOG_FILE: &str = "airflow.py.json"; -/// Return the address of the Vector aggregator if the corresponding ConfigMap name is given in the -/// cluster spec -pub async fn resolve_vector_aggregator_address( - client: &Client, - cluster: &T, - vector_aggregator_config_map_name: Option<&str>, -) -> Result> { - let vector_aggregator_address = - if let Some(vector_aggregator_config_map_name) = vector_aggregator_config_map_name { - let namespace = cluster - .meta() - .namespace - .as_deref() - .context(ObjectHasNoNamespaceSnafu)?; - let vector_aggregator_address = client - .get::(vector_aggregator_config_map_name, namespace) - .await - .context(ConfigMapNotFoundSnafu { - cm_name: vector_aggregator_config_map_name.to_string(), - })? - .data - .and_then(|mut data| data.remove(VECTOR_AGGREGATOR_CM_ENTRY)) - .context(MissingConfigMapEntrySnafu { - entry: VECTOR_AGGREGATOR_CM_ENTRY, - cm_name: vector_aggregator_config_map_name.to_string(), - })?; - Some(vector_aggregator_address) - } else { - None - }; - Ok(vector_aggregator_address) -} - /// Extend the ConfigMap with logging and Vector configurations pub fn extend_config_map_with_log_config( rolegroup: &RoleGroupRef, - vector_aggregator_address: Option<&str>, logging: &Logging, main_container: &C, vector_container: &C, @@ -107,11 +70,7 @@ where if logging.enable_vector_agent { cm_builder.add_data( product_logging::framework::VECTOR_CONFIG_FILE, - product_logging::framework::create_vector_config( - rolegroup, - vector_aggregator_address.context(MissingVectorAggregatorAddressSnafu)?, - vector_log_config, - ), + product_logging::framework::create_vector_config(rolegroup, vector_log_config), ); }