From 0478b6d60df654c74d644b3bcf98fd105fc3295e Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Wed, 19 Mar 2025 16:51:38 +0100 Subject: [PATCH 1/4] switch order of config resolution so defaults can be overridden --- Cargo.nix | 542 ++++++++++-------- .../operator-binary/src/airflow_controller.rs | 30 +- .../smoke/40-install-airflow-cluster.yaml.j2 | 21 + tests/templates/kuttl/smoke/41-assert.yaml | 4 + 4 files changed, 349 insertions(+), 248 deletions(-) diff --git a/Cargo.nix b/Cargo.nix index 49ffb31d..750cdf57 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -158,7 +158,7 @@ rec { } { name = "zerocopy"; - packageId = "zerocopy"; + packageId = "zerocopy 0.7.35"; usesDefaultFeatures = false; features = [ "simd" ]; } @@ -366,9 +366,9 @@ rec { }; "anyhow" = rec { crateName = "anyhow"; - version = "1.0.95"; + version = "1.0.97"; edition = "2018"; - sha256 = "010vd1ki8w84dzgx6c81sc8qm9n02fxic1gkpv52zp4nwrn0kb1l"; + sha256 = "0kvspbiwncmmkdgrwjrimsmbmhzxc641p5ql99l2rjq6smmdbznw"; authors = [ "David Tolnay " ]; @@ -455,7 +455,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "full" "visit-mut" ]; } ]; @@ -463,9 +463,9 @@ rec { }; "async-trait" = rec { crateName = "async-trait"; - version = "0.1.85"; + version = "0.1.87"; edition = "2021"; - sha256 = "0mm0gwad44zs7mna4a0m1z4dhzpmydfj73w4wm23c8xpnhrli4rz"; + sha256 = "15swwmyl4nx7w03rq6ibb4x2c8rzbx9fpiag1kn4fhapb49yqmnm"; procMacro = true; libName = "async_trait"; authors = [ @@ -482,7 +482,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; usesDefaultFeatures = false; features = [ "clone-impls" "full" "parsing" "printing" "proc-macro" "visit-mut" ]; } @@ -659,9 +659,9 @@ rec { }; "bitflags" = rec { crateName = "bitflags"; - version = "2.8.0"; + version = "2.9.0"; edition = "2021"; - sha256 = "0dixc6168i98652jxf0z9nbyn0zcis3g6hi6qdr7z5dbhcygas4g"; + sha256 = "1gb5w7pxnmx8l2bjz1i6rkbwbm2167k294rhy6cl1y3vbc8i90jw"; authors = [ "The Rust Project Developers" ]; @@ -693,9 +693,9 @@ rec { }; "built" = rec { crateName = "built"; - version = "0.7.5"; + version = "0.7.7"; edition = "2021"; - sha256 = "0fyhzjgymls3qylggd6rs4vkq44rkl1kyv33lfbfrdsjxmd50q63"; + sha256 = "0ywn0m11xm80pg6zrzq3sdj3vmzg3qs6baqnvfmkd377ly8n3van"; authors = [ "Lukas Lueg " ]; @@ -725,9 +725,9 @@ rec { }; "bumpalo" = rec { crateName = "bumpalo"; - version = "3.16.0"; + version = "3.17.0"; edition = "2021"; - sha256 = "0b015qb4knwanbdlp1x48pkb4pm57b8gidbhhhxr900q2wb6fabr"; + sha256 = "1gxxsn2fsjmv03g8p3m749mczv2k4m8xspifs5l7bcx0vx3gna0n"; authors = [ "Nick Fitzgerald " ]; @@ -752,24 +752,25 @@ rec { }; "bytes" = rec { crateName = "bytes"; - version = "1.9.0"; + version = "1.10.1"; edition = "2018"; - sha256 = "16ykzx24v1x4f42v2lxyvlczqhdfji3v7r4ghwckpwijzvb1hn9j"; + sha256 = "0smd4wi2yrhp5pmq571yiaqx84bjqlm1ixqhnvfwzzc6pqkn26yp"; authors = [ "Carl Lerche " "Sean McArthur " ]; features = { "default" = [ "std" ]; + "extra-platforms" = [ "dep:extra-platforms" ]; "serde" = [ "dep:serde" ]; }; resolvedDefaultFeatures = [ "default" "std" ]; }; "cc" = rec { crateName = "cc"; - version = "1.2.9"; + version = "1.2.16"; edition = "2018"; - sha256 = "02rim94a0c7rdwyc5yz6wlzyd4cm22r4b6x3maylb4sx2rr3faf8"; + sha256 = "131bhgafc1i86vvjipkj0kwzz0hlpwrkl8mdbmzyq2g69calqwdy"; authors = [ "Alex Crichton " ]; @@ -814,9 +815,9 @@ rec { }; "chrono" = rec { crateName = "chrono"; - version = "0.4.39"; + version = "0.4.40"; edition = "2021"; - sha256 = "09g8nf409lb184kl9j4s85k0kn8wzgjkp5ls9zid50b886fwqdky"; + sha256 = "0z334kqnvq5zx6xsq1k6zk8g9z14fgk2w3vkn4n13pvi3mhn8y8s"; dependencies = [ { name = "android-tzdata"; @@ -843,8 +844,8 @@ rec { usesDefaultFeatures = false; } { - name = "windows-targets"; - packageId = "windows-targets"; + name = "windows-link"; + packageId = "windows-link"; optional = true; target = { target, features }: (target."windows" or false); } @@ -868,17 +869,17 @@ rec { "unstable-locales" = [ "pure-rust-locales" ]; "wasm-bindgen" = [ "dep:wasm-bindgen" ]; "wasmbind" = [ "wasm-bindgen" "js-sys" ]; - "winapi" = [ "windows-targets" ]; - "windows-targets" = [ "dep:windows-targets" ]; + "winapi" = [ "windows-link" ]; + "windows-link" = [ "dep:windows-link" ]; }; - resolvedDefaultFeatures = [ "alloc" "android-tzdata" "clock" "iana-time-zone" "now" "serde" "std" "winapi" "windows-targets" ]; + resolvedDefaultFeatures = [ "alloc" "android-tzdata" "clock" "iana-time-zone" "now" "serde" "std" "winapi" "windows-link" ]; }; "clap" = rec { crateName = "clap"; - version = "4.5.26"; + version = "4.5.32"; edition = "2021"; crateBin = []; - sha256 = "10v7qvn90calfbhap1c4r249i5c7fbxj09fn3szfz9pkis85xsx8"; + sha256 = "10vg2fbcsy0dwxdqpdqihxl8b935310lax6dc29d221nijpg7230"; dependencies = [ { name = "clap_builder"; @@ -907,6 +908,7 @@ rec { "unicode" = [ "clap_builder/unicode" ]; "unstable-doc" = [ "clap_builder/unstable-doc" "derive" ]; "unstable-ext" = [ "clap_builder/unstable-ext" ]; + "unstable-markdown" = [ "clap_derive/unstable-markdown" ]; "unstable-styles" = [ "clap_builder/unstable-styles" ]; "unstable-v5" = [ "clap_builder/unstable-v5" "clap_derive?/unstable-v5" "deprecated" ]; "usage" = [ "clap_builder/usage" ]; @@ -916,9 +918,9 @@ rec { }; "clap_builder" = rec { crateName = "clap_builder"; - version = "4.5.26"; + version = "4.5.32"; edition = "2021"; - sha256 = "08f1mzcvi7zjhm7hvz6al4jnv70ccqhwiaq74hihlspwnl0iic4n"; + sha256 = "1j5cdwdry9anb8ljzqymb15byghz8jcpzafshbxysmb1cxzyz9r2"; dependencies = [ { name = "anstream"; @@ -955,9 +957,9 @@ rec { }; "clap_derive" = rec { crateName = "clap_derive"; - version = "4.5.24"; + version = "4.5.32"; edition = "2021"; - sha256 = "131ih3dm76srkbpfx7zfspp9b556zgzj31wqhl0ji2b39lcmbdsl"; + sha256 = "1mqcag8qapb5yhygg2hi153kzmbf7w5hqp3nl3fvl5cn4yp6l5q9"; procMacro = true; dependencies = [ { @@ -974,12 +976,13 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "full" ]; } ]; features = { "raw-deprecated" = [ "deprecated" ]; + "unstable-markdown" = [ "dep:pulldown-cmark" "dep:anstyle" ]; "unstable-v5" = [ "deprecated" ]; }; resolvedDefaultFeatures = [ "default" ]; @@ -1185,9 +1188,9 @@ rec { }; "cpufeatures" = rec { crateName = "cpufeatures"; - version = "0.2.16"; + version = "0.2.17"; edition = "2018"; - sha256 = "1hy466fkhxjbb16i7na95wz8yr14d0kd578pwzj5lbkz14jh5f0n"; + sha256 = "10023dnnaghhdl70xcds12fsx2b966sxbxjq5sxs49mvxqw5ivar"; authors = [ "RustCrypto Developers" ]; @@ -1195,21 +1198,25 @@ rec { { name = "libc"; packageId = "libc"; + usesDefaultFeatures = false; target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "aarch64-linux-android"); } { name = "libc"; packageId = "libc"; + usesDefaultFeatures = false; target = { target, features }: (("aarch64" == target."arch" or null) && ("linux" == target."os" or null)); } { name = "libc"; packageId = "libc"; + usesDefaultFeatures = false; target = { target, features }: (("aarch64" == target."arch" or null) && ("apple" == target."vendor" or null)); } { name = "libc"; packageId = "libc"; + usesDefaultFeatures = false; target = { target, features }: (("loongarch64" == target."arch" or null) && ("linux" == target."os" or null)); } ]; @@ -1329,7 +1336,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "full" "extra-traits" ]; } ]; @@ -1359,7 +1366,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; } ]; @@ -1385,7 +1392,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "full" "visit-mut" ]; } ]; @@ -1472,7 +1479,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; } ]; features = { @@ -1530,9 +1537,9 @@ rec { }; "dyn-clone" = rec { crateName = "dyn-clone"; - version = "1.0.17"; + version = "1.0.19"; edition = "2018"; - sha256 = "09cig7dgg6jnqa10p4233nd8wllbjf4ffsw7wj0m4lwa5w3z0vhd"; + sha256 = "01ahm5abl20480v48nxy4ffyx80cs6263q9zf0gnrxpvm6w8yyhw"; libName = "dyn_clone"; authors = [ "David Tolnay " @@ -1565,13 +1572,13 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; } ]; devDependencies = [ { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "full" ]; } ]; @@ -1583,17 +1590,18 @@ rec { }; "either" = rec { crateName = "either"; - version = "1.13.0"; - edition = "2018"; - sha256 = "1w2c1mybrd7vljyxk77y9f4w9dyjrmp3yp82mk7bcm8848fazcb0"; + version = "1.15.0"; + edition = "2021"; + sha256 = "069p1fknsmzn9llaizh77kip0pqmcwpdsykv2x30xpjyija5gis8"; authors = [ "bluss" ]; features = { - "default" = [ "use_std" ]; + "default" = [ "std" ]; "serde" = [ "dep:serde" ]; + "use_std" = [ "std" ]; }; - resolvedDefaultFeatures = [ "default" "use_std" ]; + resolvedDefaultFeatures = [ "default" "std" "use_std" ]; }; "encoding_rs" = rec { crateName = "encoding_rs"; @@ -1673,7 +1681,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; } ]; features = { @@ -1681,9 +1689,9 @@ rec { }; "equivalent" = rec { crateName = "equivalent"; - version = "1.0.1"; + version = "1.0.2"; edition = "2015"; - sha256 = "1malmx5f4lkfvqasz319lq6gb3ddg19yzf9s8cykfsgzdmyq0hsl"; + sha256 = "03swzqznragy8n0x31lqc78g2af054jwivp7lkrbrc0khz74lyl7"; }; "event-listener" = rec { @@ -2011,7 +2019,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "full" ]; } ]; @@ -2231,9 +2239,9 @@ rec { }; "git2" = rec { crateName = "git2"; - version = "0.19.0"; + version = "0.20.0"; edition = "2018"; - sha256 = "091pv7866z1qjq800ys0wjv8n73wrv7fqdrddxcnq36w8lzbf0xr"; + sha256 = "1zwav0r76njd9chqxh7wj4r4zfn08nzsisrg05liyd6cjf4piniz"; authors = [ "Josh Triplett " "Alex Crichton " @@ -2261,12 +2269,11 @@ rec { } ]; features = { - "default" = [ "ssh" "https" "ssh_key_from_memory" ]; + "default" = [ "ssh" "https" ]; "https" = [ "libgit2-sys/https" "openssl-sys" "openssl-probe" ]; "openssl-probe" = [ "dep:openssl-probe" ]; "openssl-sys" = [ "dep:openssl-sys" ]; "ssh" = [ "libgit2-sys/ssh" ]; - "ssh_key_from_memory" = [ "libgit2-sys/ssh_key_from_memory" ]; "vendored-libgit2" = [ "libgit2-sys/vendored" ]; "vendored-openssl" = [ "openssl-sys/vendored" "libgit2-sys/vendored-openssl" ]; "zlib-ng-compat" = [ "libgit2-sys/zlib-ng-compat" ]; @@ -2458,9 +2465,9 @@ rec { }; "http" = rec { crateName = "http"; - version = "1.2.0"; + version = "1.3.1"; edition = "2018"; - sha256 = "1skglzdf98j5nzxlii540n11is0w4l80mi5sm3xrj716asps4v7i"; + sha256 = "0r95i5h7dr1xadp1ac9453w0s62s27hzkam356nyx2d9mqqmva7l"; authors = [ "Alex Crichton " "Carl Lerche " @@ -2510,9 +2517,9 @@ rec { }; "http-body-util" = rec { crateName = "http-body-util"; - version = "0.1.2"; + version = "0.1.3"; edition = "2018"; - sha256 = "0kslwazg4400qnc2azkrgqqci0fppv12waicnsy5d8hncvbjjd3r"; + sha256 = "0jm6jv4gxsnlsi1kzdyffjrj8cfr3zninnxpw73mvkxy4qzdj8dh"; libName = "http_body_util"; authors = [ "Carl Lerche " @@ -2525,8 +2532,8 @@ rec { packageId = "bytes"; } { - name = "futures-util"; - packageId = "futures-util"; + name = "futures-core"; + packageId = "futures-core"; usesDefaultFeatures = false; } { @@ -2542,13 +2549,17 @@ rec { packageId = "pin-project-lite"; } ]; - + features = { + "channel" = [ "dep:tokio" ]; + "full" = [ "channel" ]; + }; + resolvedDefaultFeatures = [ "default" ]; }; "httparse" = rec { crateName = "httparse"; - version = "1.9.5"; + version = "1.10.1"; edition = "2018"; - sha256 = "0ip9v8m9lvgvq1lznl31wvn0ch1v254na7lhid9p29yx9rbx6wbx"; + sha256 = "11ycd554bw2dkgw0q61xsa7a4jn1wb1xbfacmf3dbwsikvkkvgvd"; authors = [ "Sean McArthur " ]; @@ -2569,9 +2580,9 @@ rec { }; "hyper" = rec { crateName = "hyper"; - version = "1.5.2"; + version = "1.6.0"; edition = "2021"; - sha256 = "1q7akfb443yrjzkmnnbp2vs8zi15hgbk466rr4y144v4ppabhvr5"; + sha256 = "103ggny2k31z0iq2gzwk2vbx601wx6xkpjpxn40hr3p3b0b5fayc"; authors = [ "Sean McArthur " ]; @@ -2666,9 +2677,9 @@ rec { }; "hyper-http-proxy" = rec { crateName = "hyper-http-proxy"; - version = "1.0.0"; + version = "1.1.0"; edition = "2021"; - sha256 = "195r0x68m2mgcc8rawbc0plsm9w4lrqhlm7vqsbdjd6gpbgxn1jx"; + sha256 = "023w7w9si4zs5phfj30g3dkkk713ipix10dsqj5h443mwfhv1m3s"; libName = "hyper_http_proxy"; authors = [ "MetalBear Tech LTD " @@ -3471,7 +3482,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; } ]; @@ -3541,9 +3552,9 @@ rec { }; "indexmap" = rec { crateName = "indexmap"; - version = "2.7.0"; + version = "2.8.0"; edition = "2021"; - sha256 = "07s7jmdymvd0rm4yswp0j3napx57hkjm9gs9n55lvs2g78vj5y32"; + sha256 = "0n3hkpzch6q3wgzh8g8hiyac6kk3vgd8nfsxy8mi80jvw47xam1r"; dependencies = [ { name = "equivalent"; @@ -3562,16 +3573,15 @@ rec { "default" = [ "std" ]; "quickcheck" = [ "dep:quickcheck" ]; "rayon" = [ "dep:rayon" ]; - "rustc-rayon" = [ "dep:rustc-rayon" ]; "serde" = [ "dep:serde" ]; }; resolvedDefaultFeatures = [ "default" "std" ]; }; "indoc" = rec { crateName = "indoc"; - version = "2.0.5"; + version = "2.0.6"; edition = "2021"; - sha256 = "1dgjk49rkmx4kjy07k4b90qb5vl89smgb5rcw02n0q0x9ligaj5j"; + sha256 = "1gbn2pkx5sgbd9lp05d2bkqpbfgazi0z3nvharh5ajah11d29izl"; procMacro = true; authors = [ "David Tolnay " @@ -3649,9 +3659,9 @@ rec { }; "itoa" = rec { crateName = "itoa"; - version = "1.0.14"; + version = "1.0.15"; edition = "2018"; - sha256 = "0x26kr9m062mafaxgcf2p6h2x7cmixm0zw95aipzn2hr3d5jlnnp"; + sha256 = "0b4fj9kz54dr3wam0vprjwgygvycyw8r0qwg7vp19ly8b2w16psa"; authors = [ "David Tolnay " ]; @@ -3797,7 +3807,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.11"; + packageId = "thiserror 2.0.12"; } ]; @@ -4134,7 +4144,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.11"; + packageId = "thiserror 2.0.12"; } { name = "tokio"; @@ -4298,7 +4308,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.11"; + packageId = "thiserror 2.0.12"; } ]; devDependencies = [ @@ -4350,7 +4360,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "extra-traits" ]; } ]; @@ -4445,7 +4455,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.11"; + packageId = "thiserror 2.0.12"; } { name = "tokio"; @@ -4498,9 +4508,9 @@ rec { }; "libc" = rec { crateName = "libc"; - version = "0.2.169"; + version = "0.2.171"; edition = "2021"; - sha256 = "02m253hs8gw0m1n8iyrsc4n15yzbqwhddi7w1l0ds7i92kdsiaxm"; + sha256 = "1mipla3dy3l59pfa9xy4iw2vdgn8n30dzf4vdnasjflxdqhkg6f1"; authors = [ "The Rust Project Developers" ]; @@ -4514,10 +4524,10 @@ rec { }; "libgit2-sys" = rec { crateName = "libgit2-sys"; - version = "0.17.0+1.8.1"; + version = "0.18.0+1.9.0"; edition = "2018"; links = "git2"; - sha256 = "093jxfl2i9vxdlgf7vk9d040sjwy0nq4fid640y7qix6m0k26iqh"; + sha256 = "1v7zcw1kky338grxs70y7fwpy70g846bpa5yzvl9f5bybr31g8g1"; libName = "libgit2_sys"; libPath = "lib.rs"; authors = [ @@ -4600,14 +4610,13 @@ rec { }; "litemap" = rec { crateName = "litemap"; - version = "0.7.4"; + version = "0.7.5"; edition = "2021"; - sha256 = "012ili3vppd4952sh6y3qwcd0jkd0bq2qpr9h7cppc8sj11k7saf"; + sha256 = "0mi8ykav0s974ps79p438x04snh0cdb7lc864b42jws5375i9yr3"; authors = [ "The ICU4X Project Developers" ]; features = { - "bench" = [ "serde" ]; "databake" = [ "dep:databake" ]; "default" = [ "alloc" ]; "serde" = [ "dep:serde" ]; @@ -4646,9 +4655,9 @@ rec { }; "log" = rec { crateName = "log"; - version = "0.4.25"; + version = "0.4.26"; edition = "2021"; - sha256 = "17ydv5zhfv1zzygy458bmg3f3jx1vfziv9d74817w76yhfqgbjq4"; + sha256 = "17mvchkvhnm2zxyfagh2g9p861f0qx2g1sg2v14sww9nvjry5g9h"; authors = [ "The Rust Project Developers" ]; @@ -4715,9 +4724,9 @@ rec { }; "miniz_oxide" = rec { crateName = "miniz_oxide"; - version = "0.8.3"; + version = "0.8.5"; edition = "2021"; - sha256 = "093r1kd1r9dyf05cbvsibgmh96pxp3qhzfvpd6f15bpggamjqh5q"; + sha256 = "1r9whkc61xri7m1cn4rjrjlhr32ab29nvfxcbg0ri5mmpgg08glf"; authors = [ "Frommi " "oyvindln " @@ -4904,9 +4913,9 @@ rec { }; "once_cell" = rec { crateName = "once_cell"; - version = "1.20.2"; + version = "1.21.1"; edition = "2021"; - sha256 = "0xb7rw1aqr7pa4z3b00y7786gyf8awx2gca3md73afy76dzgwq8j"; + sha256 = "1g645fg3rk800ica72ypwajllgij38az3n831sm2rragrknhnnyp"; authors = [ "Aleksey Kladov " ]; @@ -4923,9 +4932,9 @@ rec { }; "openssl-probe" = rec { crateName = "openssl-probe"; - version = "0.1.5"; - edition = "2015"; - sha256 = "1kq18qm48rvkwgcggfkqq6pm948190czqc94d6bm2sir5hq1l0gz"; + version = "0.1.6"; + edition = "2021"; + sha256 = "0bl52x55laalqb707k009h8kfawliwp992rlsvkzy49n47p2fpnh"; libName = "openssl_probe"; authors = [ "Alex Crichton " @@ -5340,9 +5349,9 @@ rec { }; "pem" = rec { crateName = "pem"; - version = "3.0.4"; + version = "3.0.5"; edition = "2021"; - sha256 = "1blgcn17wc41yxdzrxlsir5m6ds8r13ijmpsqda6lwwhwmjr6icf"; + sha256 = "1wwfk8sbyi9l18fvvn6z9p2gy7v7q7wimbhvrvixxj8a8zl3ibrq"; authors = [ "Jonathan Creekmore " ]; @@ -5398,7 +5407,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.11"; + packageId = "thiserror 2.0.12"; optional = true; } { @@ -5473,7 +5482,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; } ]; features = { @@ -5516,9 +5525,9 @@ rec { }; "pin-project" = rec { crateName = "pin-project"; - version = "1.1.8"; + version = "1.1.10"; edition = "2021"; - sha256 = "05jr3xfy1spgmz3q19l4mmvv46vgvkvsgphamifx7x45swxcabhy"; + sha256 = "12kadbnfm1f43cyadw9gsbyln1cy7vj764wz5c8wxaiza3filzv7"; libName = "pin_project"; dependencies = [ { @@ -5530,9 +5539,9 @@ rec { }; "pin-project-internal" = rec { crateName = "pin-project-internal"; - version = "1.1.8"; + version = "1.1.10"; edition = "2021"; - sha256 = "1yzfhf6l27nhzv7r5hfrwj2g0x7xmfhgil19fj9am4srqp06csnm"; + sha256 = "0qgqzfl0f4lzaz7yl5llhbg97g68r15kljzihaw9wm64z17qx4bf"; procMacro = true; libName = "pin_project_internal"; dependencies = [ @@ -5546,7 +5555,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; usesDefaultFeatures = false; features = [ "parsing" "printing" "clone-impls" "proc-macro" "full" "visit-mut" ]; } @@ -5574,9 +5583,9 @@ rec { }; "pkg-config" = rec { crateName = "pkg-config"; - version = "0.3.31"; + version = "0.3.32"; edition = "2018"; - sha256 = "1wk6yp2phl91795ia0lwkr3wl4a9xkrympvhqq8cxk4d75hwhglm"; + sha256 = "0k4h3gnzs94sjb2ix6jyksacs52cf1fanpwsmlhjnwrdnp8dppby"; libName = "pkg_config"; authors = [ "Alex Crichton " @@ -5599,9 +5608,9 @@ rec { }; "ppv-lite86" = rec { crateName = "ppv-lite86"; - version = "0.2.20"; + version = "0.2.21"; edition = "2021"; - sha256 = "017ax9ssdnpww7nrl1hvqh2lzncpv04nnsibmnw9nxjnaqlpp5bp"; + sha256 = "1abxx6qz5qnd43br1dd9b2savpihzjza8gb4fbzdql1gxp2f7sl5"; libName = "ppv_lite86"; authors = [ "The CryptoCorrosion Contributors" @@ -5609,8 +5618,8 @@ rec { dependencies = [ { name = "zerocopy"; - packageId = "zerocopy"; - features = [ "simd" "derive" ]; + packageId = "zerocopy 0.8.23"; + features = [ "simd" ]; } ]; features = { @@ -5620,9 +5629,9 @@ rec { }; "proc-macro-crate" = rec { crateName = "proc-macro-crate"; - version = "3.2.0"; + version = "3.3.0"; edition = "2021"; - sha256 = "0yzsqnavb3lmrcsmbrdjfrky9vcbl46v59xi9avn0796rb3likwf"; + sha256 = "0d9xlymplfi9yv3f5g4bp0d6qh70apnihvqcjllampx4f5lmikpd"; libName = "proc_macro_crate"; authors = [ "Bastian Köcher " @@ -5631,15 +5640,17 @@ rec { { name = "toml_edit"; packageId = "toml_edit"; + usesDefaultFeatures = false; + features = [ "parse" ]; } ]; }; "proc-macro2" = rec { crateName = "proc-macro2"; - version = "1.0.93"; + version = "1.0.94"; edition = "2021"; - sha256 = "169dw9wch753if1mgyi2nfl1il77gslvh6y2q46qplprwml6m530"; + sha256 = "114wxb56gdj9vy44q0ll3l2x9niqzcbyqikydmlb5f3h5rsp26d3"; libName = "proc_macro2"; authors = [ "David Tolnay " @@ -5713,9 +5724,9 @@ rec { }; "quote" = rec { crateName = "quote"; - version = "1.0.38"; + version = "1.0.40"; edition = "2018"; - sha256 = "1k0s75w61k6ch0rs263r4j69b7vj1wadqgb9dia4ylc9mymcqk8f"; + sha256 = "1394cxjg6nwld82pzp2d4fp6pmaz32gai1zh9z5hvh0dawww118q"; authors = [ "David Tolnay " ]; @@ -5832,9 +5843,9 @@ rec { }; "redox_syscall" = rec { crateName = "redox_syscall"; - version = "0.5.8"; + version = "0.5.10"; edition = "2021"; - sha256 = "0d48ylyd6gsamynyp257p6n2zl4dw2fhnn5z9y3nhgpri6rn5a03"; + sha256 = "1l9b638qx72312yzh8ykvda9b3lqd9gf6yqn66b23a331ck0r30b"; libName = "syscall"; authors = [ "Jeremy Soller " @@ -6044,13 +6055,10 @@ rec { }; "ring" = rec { crateName = "ring"; - version = "0.17.8"; + version = "0.17.14"; edition = "2021"; - links = "ring_core_0_17_8"; - sha256 = "03fwlb1ssrmfxdckvqv033pfmk01rhx9ynwi7r186dcfcp5s8zy1"; - authors = [ - "Brian Smith " - ]; + links = "ring_core_0_17_14_"; + sha256 = "1dw32gv19ccq4hsx3ribhpdzri1vnrlcfqb2vj41xn4l49n9ws54"; dependencies = [ { name = "cfg-if"; @@ -6065,14 +6073,13 @@ rec { name = "libc"; packageId = "libc"; usesDefaultFeatures = false; - target = { target, features }: ((("android" == target."os" or null) || ("linux" == target."os" or null)) && (("aarch64" == target."arch" or null) || ("arm" == target."arch" or null))); + target = { target, features }: ((("aarch64" == target."arch" or null) && ("little" == target."endian" or null)) && ("apple" == target."vendor" or null) && (("ios" == target."os" or null) || ("macos" == target."os" or null) || ("tvos" == target."os" or null) || ("visionos" == target."os" or null) || ("watchos" == target."os" or null))); } { - name = "spin"; - packageId = "spin"; + name = "libc"; + packageId = "libc"; usesDefaultFeatures = false; - target = { target, features }: (("aarch64" == target."arch" or null) || ("arm" == target."arch" or null) || ("x86" == target."arch" or null) || ("x86_64" == target."arch" or null)); - features = [ "once" ]; + target = { target, features }: (((("aarch64" == target."arch" or null) && ("little" == target."endian" or null)) || (("arm" == target."arch" or null) && ("little" == target."endian" or null))) && (("android" == target."os" or null) || ("linux" == target."os" or null))); } { name = "untrusted"; @@ -6081,7 +6088,7 @@ rec { { name = "windows-sys"; packageId = "windows-sys 0.52.0"; - target = { target, features }: (("aarch64" == target."arch" or null) && ("windows" == target."os" or null)); + target = { target, features }: ((("aarch64" == target."arch" or null) && ("little" == target."endian" or null)) && ("windows" == target."os" or null)); features = [ "Win32_Foundation" "Win32_System_Threading" ]; } ]; @@ -6186,7 +6193,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "full" "parsing" "extra-traits" "visit" "visit-mut" ]; } { @@ -6236,9 +6243,9 @@ rec { }; "rustls" = rec { crateName = "rustls"; - version = "0.23.21"; + version = "0.23.23"; edition = "2021"; - sha256 = "1f75gicypi40bdq20h1rglwaapr3ifnchgf697clkxibc0j7ja4g"; + sha256 = "15gk2bmry78cps3ya38a7cn4jxc36xv1r7gndr0fbz40qjc6qya7"; dependencies = [ { name = "log"; @@ -6294,6 +6301,7 @@ rec { "hashbrown" = [ "dep:hashbrown" ]; "log" = [ "dep:log" ]; "logging" = [ "log" ]; + "prefer-post-quantum" = [ "aws_lc_rs" ]; "read_buf" = [ "rustversion" "std" ]; "ring" = [ "dep:ring" "webpki/ring" ]; "rustversion" = [ "dep:rustversion" ]; @@ -6388,9 +6396,9 @@ rec { }; "rustls-pki-types" = rec { crateName = "rustls-pki-types"; - version = "1.10.1"; + version = "1.11.0"; edition = "2021"; - sha256 = "0dqb3d0cbld1yrp084wyzgw6yk3qzzic8l5pbs1b6bcjzzk4ggyj"; + sha256 = "0755isc0x5iymm3wsn59s0ad1pm9zidw7p34qfqlsjsac9jf4z4i"; libName = "rustls_pki_types"; features = { "default" = [ "alloc" ]; @@ -6435,9 +6443,9 @@ rec { }; "rustversion" = rec { crateName = "rustversion"; - version = "1.0.19"; + version = "1.0.20"; edition = "2018"; - sha256 = "1m39qd65jcd1xgqzdm3017ppimiggh2446xngwp1ngr8hjbmpi7p"; + sha256 = "1lhwjb16dsm8brd18bn2bh0ryzc7qi29bi2jjsc6ny2zbwn3ivgd"; procMacro = true; build = "build/build.rs"; authors = [ @@ -6447,9 +6455,9 @@ rec { }; "ryu" = rec { crateName = "ryu"; - version = "1.0.18"; + version = "1.0.20"; edition = "2018"; - sha256 = "17xx2s8j1lln7iackzd9p0sv546vjq71i779gphjq923vjh5pjzk"; + sha256 = "07s855l8sb333h6bpn24pka5sp7hjk2w667xy6a0khkf6sqv5lr8"; authors = [ "David Tolnay " ]; @@ -6484,9 +6492,9 @@ rec { }; "schemars" = rec { crateName = "schemars"; - version = "0.8.21"; + version = "0.8.22"; edition = "2021"; - sha256 = "14lyx04388wgbilgcm0nl75w6359nw16glswfqv7x2rpi9329h09"; + sha256 = "05an9nbi18ynyxv1rjmwbg6j08j0496hd64mjggh53mwp3hjmgrz"; authors = [ "Graham Esau " ]; @@ -6550,9 +6558,9 @@ rec { }; "schemars_derive" = rec { crateName = "schemars_derive"; - version = "0.8.21"; + version = "0.8.22"; edition = "2021"; - sha256 = "03ncmrkldfmdc9skmlyysx2vqdlyyz91r5mbavw77zwaay4fbvmi"; + sha256 = "0kakyzrp5801s4i043l4ilv96lzimnlh01pap958h66n99w6bqij"; procMacro = true; authors = [ "Graham Esau " @@ -6572,7 +6580,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "extra-traits" ]; } ]; @@ -6734,9 +6742,9 @@ rec { }; "semver" = rec { crateName = "semver"; - version = "1.0.24"; + version = "1.0.26"; edition = "2018"; - sha256 = "1fmvjjkd3f64y5fqr1nakkq371mnwzv09fbz5mbmdxril63ypdiw"; + sha256 = "1l5q2vb8fjkby657kdyfpvv40x2i2xqq9bg57pxqakfj92fgmrjn"; authors = [ "David Tolnay " ]; @@ -6748,9 +6756,9 @@ rec { }; "serde" = rec { crateName = "serde"; - version = "1.0.217"; + version = "1.0.219"; edition = "2018"; - sha256 = "0w2ck1p1ajmrv1cf51qf7igjn2nc51r0izzc00fzmmhkvxjl5z02"; + sha256 = "1dl6nyxnsi82a197sd752128a4avm6mxnscywas1jq30srp2q3jz"; authors = [ "Erick Tryzelaar " "David Tolnay " @@ -6803,9 +6811,9 @@ rec { }; "serde_derive" = rec { crateName = "serde_derive"; - version = "1.0.217"; + version = "1.0.219"; edition = "2015"; - sha256 = "180r3rj5gi5s1m23q66cr5wlfgc5jrs6n1mdmql2njnhk37zg6ss"; + sha256 = "001azhjmj7ya52pmfiw4ppxm16nd44y15j2pf5gkcwrcgz7pc0jv"; procMacro = true; authors = [ "Erick Tryzelaar " @@ -6826,7 +6834,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; usesDefaultFeatures = false; features = [ "clone-impls" "derive" "parsing" "printing" "proc-macro" ]; } @@ -6858,7 +6866,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; usesDefaultFeatures = false; features = [ "clone-impls" "derive" "parsing" "printing" ]; } @@ -6867,9 +6875,9 @@ rec { }; "serde_json" = rec { crateName = "serde_json"; - version = "1.0.135"; + version = "1.0.140"; edition = "2021"; - sha256 = "1n9hcsbxpr2lg5kvlksbcy6bkvqv9rn3hy59600i21kli2i7n39b"; + sha256 = "0wwkp4vc20r87081ihj3vpyz5qf7wqkqipq17v99nv6wjrp8n1i0"; authors = [ "Erick Tryzelaar " "David Tolnay " @@ -7097,9 +7105,9 @@ rec { }; "smallvec" = rec { crateName = "smallvec"; - version = "1.13.2"; + version = "1.14.0"; edition = "2018"; - sha256 = "0rsw5samawl3wsw6glrsb127rx6sh89a8wyikicw6dkdcjd1lpiw"; + sha256 = "1z8wpr53x6jisklqhkkvkgyi8s5cn69h2d2alhqfxahzxwiq7kvz"; authors = [ "The Servo Project Developers" ]; @@ -7107,6 +7115,7 @@ rec { "arbitrary" = [ "dep:arbitrary" ]; "const_new" = [ "const_generics" ]; "drain_keep_rest" = [ "drain_filter" ]; + "malloc_size_of" = [ "dep:malloc_size_of" ]; "serde" = [ "dep:serde" ]; }; resolvedDefaultFeatures = [ "const_generics" "const_new" ]; @@ -7230,7 +7239,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "full" ]; } ]; @@ -7264,31 +7273,6 @@ rec { }; resolvedDefaultFeatures = [ "all" ]; }; - "spin" = rec { - crateName = "spin"; - version = "0.9.8"; - edition = "2015"; - sha256 = "0rvam5r0p3a6qhc18scqpvpgb3ckzyqxpgdfyjnghh8ja7byi039"; - authors = [ - "Mathijs van de Nes " - "John Ericson " - "Joshua Barretto " - ]; - features = { - "barrier" = [ "mutex" ]; - "default" = [ "lock_api" "mutex" "spin_mutex" "rwlock" "once" "lazy" "barrier" ]; - "fair_mutex" = [ "mutex" ]; - "lazy" = [ "once" ]; - "lock_api" = [ "lock_api_crate" ]; - "lock_api_crate" = [ "dep:lock_api_crate" ]; - "portable-atomic" = [ "dep:portable-atomic" ]; - "portable_atomic" = [ "portable-atomic" ]; - "spin_mutex" = [ "mutex" ]; - "ticket_mutex" = [ "mutex" ]; - "use_ticket_mutex" = [ "mutex" "ticket_mutex" ]; - }; - resolvedDefaultFeatures = [ "once" ]; - }; "stable_deref_trait" = rec { crateName = "stable_deref_trait"; version = "1.2.0"; @@ -7598,7 +7582,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; } ]; @@ -7727,7 +7711,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; } ]; devDependencies = [ @@ -7806,7 +7790,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "parsing" ]; } ]; @@ -7859,11 +7843,11 @@ rec { }; resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "full" "parsing" "printing" "proc-macro" "quote" ]; }; - "syn 2.0.96" = rec { + "syn 2.0.100" = rec { crateName = "syn"; - version = "2.0.96"; + version = "2.0.100"; edition = "2021"; - sha256 = "102wk3cgawimi3i0q3r3xw3i858zkyingg6y7gsxfy733amsvl6m"; + sha256 = "18623wdkns03blpv65xsjn8fipl9p9hj98vlrnhin7nqran496mh"; authors = [ "David Tolnay " ]; @@ -7926,7 +7910,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; usesDefaultFeatures = false; features = [ "derive" "parsing" "printing" "clone-impls" "visit" "extra-traits" ]; } @@ -7953,18 +7937,18 @@ rec { ]; }; - "thiserror 2.0.11" = rec { + "thiserror 2.0.12" = rec { crateName = "thiserror"; - version = "2.0.11"; + version = "2.0.12"; edition = "2021"; - sha256 = "1z0649rpa8c2smzx129bz4qvxmdihj30r2km6vfpcv9yny2g4lnl"; + sha256 = "024791nsc0np63g2pq30cjf9acj38z3jwx9apvvi8qsqmqnqlysn"; authors = [ "David Tolnay " ]; dependencies = [ { name = "thiserror-impl"; - packageId = "thiserror-impl 2.0.11"; + packageId = "thiserror-impl 2.0.12"; } ]; features = { @@ -7993,16 +7977,16 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; } ]; }; - "thiserror-impl 2.0.11" = rec { + "thiserror-impl 2.0.12" = rec { crateName = "thiserror-impl"; - version = "2.0.11"; + version = "2.0.12"; edition = "2021"; - sha256 = "1hkkn7p2y4cxbffcrprybkj0qy1rl1r6waxmxqvr764axaxc3br6"; + sha256 = "07bsn7shydaidvyyrm7jz29vp78vrxr9cr9044rfmn078lmz8z3z"; procMacro = true; libName = "thiserror_impl"; authors = [ @@ -8019,7 +8003,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; } ]; @@ -8105,9 +8089,9 @@ rec { }; "time" = rec { crateName = "time"; - version = "0.3.37"; + version = "0.3.39"; edition = "2021"; - sha256 = "08bvydyc14plkwhchzia5bcdbmm0mk5fzilsdpjx06w6hf48drrm"; + sha256 = "1n6dmsj2xpk9jksdg4im5x0chz6vpqypxdl08nn3m8j03aq9ilns"; authors = [ "Jacob Pratt " "Time contributors" @@ -8185,9 +8169,9 @@ rec { }; "time-core" = rec { crateName = "time-core"; - version = "0.1.2"; + version = "0.1.3"; edition = "2021"; - sha256 = "1wx3qizcihw6z151hywfzzyd1y5dl804ydyxci6qm07vbakpr4pg"; + sha256 = "1vvn3vskn3dnvql1s0pvdlxazrjgvhksjzy2gcfw3dw5p6jrfp3n"; libName = "time_core"; authors = [ "Jacob Pratt " @@ -8197,9 +8181,9 @@ rec { }; "time-macros" = rec { crateName = "time-macros"; - version = "0.2.19"; + version = "0.2.20"; edition = "2021"; - sha256 = "1pl558z26pp342l5y91n6dxb60xwhar975wk6jc4npiygq0ycd18"; + sha256 = "0p2w00wawnr2nzpdyi6a8mg5m6kcs0crdq4xhzvwafqwx31kn2g8"; procMacro = true; libName = "time_macros"; authors = [ @@ -8251,9 +8235,9 @@ rec { }; "tokio" = rec { crateName = "tokio"; - version = "1.43.0"; + version = "1.44.1"; edition = "2021"; - sha256 = "17pdm49ihlhfw3rpxix3kdh2ppl1yv7nwp1kxazi5r1xz97zlq9x"; + sha256 = "06n90q5hh1yd844s6nf4j3fwbrkm2bnq533kp3a488l4bdhxm0pk"; authors = [ "Tokio Contributors " ]; @@ -8374,7 +8358,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "full" ]; } ]; @@ -8382,9 +8366,9 @@ rec { }; "tokio-rustls" = rec { crateName = "tokio-rustls"; - version = "0.26.1"; + version = "0.26.2"; edition = "2021"; - sha256 = "0dxz4bhkn4bwnvzjqvqlg70ba5fslnmf9r6yr87wzq5cx9shjvaz"; + sha256 = "16wf007q3584j46wc4s0zc4szj6280g23hka6x6bgs50l4v7nwlf"; libName = "tokio_rustls"; dependencies = [ { @@ -8462,9 +8446,9 @@ rec { }; "tokio-util" = rec { crateName = "tokio-util"; - version = "0.7.13"; + version = "0.7.14"; edition = "2021"; - sha256 = "0y0h10a52c7hrldmr3410bp7j3fadq0jn9nf7awddgd2an6smz6p"; + sha256 = "0d7hm1jrwpzryvni72fy5dg9blqs776wq5w38lwigk3g7swr15bb"; libName = "tokio_util"; authors = [ "Tokio Contributors " @@ -8534,9 +8518,9 @@ rec { }; "toml_edit" = rec { crateName = "toml_edit"; - version = "0.22.22"; + version = "0.22.24"; edition = "2021"; - sha256 = "1xf7sxfzmnc45f75x302qrn5aph52vc8w226v59yhrm211i8vr2a"; + sha256 = "0x0lgp70x5cl9nla03xqs5vwwwlrwmd0djkdrp3h3lpdymgpkd0p"; authors = [ "Andronik Ordian " "Ed Page " @@ -8563,7 +8547,7 @@ rec { "perf" = [ "dep:kstring" ]; "serde" = [ "dep:serde" "toml_datetime/serde" "dep:serde_spanned" ]; }; - resolvedDefaultFeatures = [ "default" "display" "parse" ]; + resolvedDefaultFeatures = [ "parse" ]; }; "tower" = rec { crateName = "tower"; @@ -8909,7 +8893,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; usesDefaultFeatures = false; features = [ "full" "parsing" "printing" "visit-mut" "clone-impls" "extra-traits" "proc-macro" ]; } @@ -9245,10 +9229,9 @@ rec { }; "typenum" = rec { crateName = "typenum"; - version = "1.17.0"; + version = "1.18.0"; edition = "2018"; - sha256 = "09dqxv69m9lj9zvv6xw5vxaqx15ps0vxyy5myg33i0kbqvq0pzs2"; - build = "build/main.rs"; + sha256 = "0gwgz8n91pv40gabrr1lzji0b0hsmg0817njpy397bq7rvizzk0x"; authors = [ "Paho Lurie-Gregg " "Andre Bogus " @@ -9274,9 +9257,9 @@ rec { }; "unicode-ident" = rec { crateName = "unicode-ident"; - version = "1.0.14"; + version = "1.0.18"; edition = "2018"; - sha256 = "10ywa1pg0glgkr4l3dppjxizr9r2b7im0ycbfa0137l69z5fdfdd"; + sha256 = "04k5r6sijkafzljykdq26mhjpmhdx4jwzvn1lh90g9ax9903jpss"; libName = "unicode_ident"; authors = [ "David Tolnay " @@ -9556,7 +9539,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "full" ]; } { @@ -9612,7 +9595,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "visit" "visit-mut" "full" ]; } { @@ -10416,6 +10399,17 @@ rec { }; resolvedDefaultFeatures = [ "default" ]; }; + "windows-link" = rec { + crateName = "windows-link"; + version = "0.1.0"; + edition = "2021"; + sha256 = "1qr0srnkw148wbrws3726pm640h2vxgcdlxn0cxpbcg27irzvk3d"; + libName = "windows_link"; + authors = [ + "Microsoft" + ]; + + }; "windows-sys 0.52.0" = rec { crateName = "windows-sys"; version = "0.52.0"; @@ -11058,9 +11052,9 @@ rec { }; "winnow" = rec { crateName = "winnow"; - version = "0.6.24"; + version = "0.7.4"; edition = "2021"; - sha256 = "0fm0z1gk9wb47s1jhh889isz657kavd1yb3fhzbjmi657icimmy8"; + sha256 = "0dmbsz6zfddcgsqzzqxw1h8f7zy19x407g7zl3hyp6vf2m2bb5qf"; dependencies = [ { name = "memchr"; @@ -11183,7 +11177,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "fold" ]; } { @@ -11193,7 +11187,7 @@ rec { ]; }; - "zerocopy" = rec { + "zerocopy 0.7.35" = rec { crateName = "zerocopy"; version = "0.7.35"; edition = "2018"; @@ -11202,27 +11196,21 @@ rec { "Joshua Liebow-Feeser " ]; dependencies = [ - { - name = "byteorder"; - packageId = "byteorder"; - optional = true; - usesDefaultFeatures = false; - } { name = "zerocopy-derive"; - packageId = "zerocopy-derive"; + packageId = "zerocopy-derive 0.7.35"; optional = true; } { name = "zerocopy-derive"; - packageId = "zerocopy-derive"; + packageId = "zerocopy-derive 0.7.35"; target = { target, features }: false; } ]; devDependencies = [ { name = "zerocopy-derive"; - packageId = "zerocopy-derive"; + packageId = "zerocopy-derive 0.7.35"; } ]; features = { @@ -11233,9 +11221,45 @@ rec { "simd-nightly" = [ "simd" ]; "zerocopy-derive" = [ "dep:zerocopy-derive" ]; }; - resolvedDefaultFeatures = [ "byteorder" "default" "derive" "simd" "zerocopy-derive" ]; + resolvedDefaultFeatures = [ "simd" ]; }; - "zerocopy-derive" = rec { + "zerocopy 0.8.23" = rec { + crateName = "zerocopy"; + version = "0.8.23"; + edition = "2021"; + sha256 = "1inbxgqhsxghawsss8x8517g30fpp8s3ll2ywy88ncm40m6l95zx"; + authors = [ + "Joshua Liebow-Feeser " + "Jack Wrenn " + ]; + dependencies = [ + { + name = "zerocopy-derive"; + packageId = "zerocopy-derive 0.8.23"; + optional = true; + } + { + name = "zerocopy-derive"; + packageId = "zerocopy-derive 0.8.23"; + target = { target, features }: false; + } + ]; + devDependencies = [ + { + name = "zerocopy-derive"; + packageId = "zerocopy-derive 0.8.23"; + } + ]; + features = { + "__internal_use_only_features_that_work_on_stable" = [ "alloc" "derive" "simd" "std" ]; + "derive" = [ "zerocopy-derive" ]; + "simd-nightly" = [ "simd" ]; + "std" = [ "alloc" ]; + "zerocopy-derive" = [ "dep:zerocopy-derive" ]; + }; + resolvedDefaultFeatures = [ "simd" ]; + }; + "zerocopy-derive 0.7.35" = rec { crateName = "zerocopy-derive"; version = "0.7.35"; edition = "2018"; @@ -11256,16 +11280,44 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; + } + ]; + + }; + "zerocopy-derive 0.8.23" = rec { + crateName = "zerocopy-derive"; + version = "0.8.23"; + edition = "2021"; + sha256 = "0m7iwisxz111sgkski722nyxv0rixbs0a9iylrcvhpfx1qfw0lk3"; + procMacro = true; + libName = "zerocopy_derive"; + authors = [ + "Joshua Liebow-Feeser " + "Jack Wrenn " + ]; + dependencies = [ + { + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "syn"; + packageId = "syn 2.0.100"; + features = [ "full" ]; } ]; }; "zerofrom" = rec { crateName = "zerofrom"; - version = "0.1.5"; + version = "0.1.6"; edition = "2021"; - sha256 = "0bnd8vjcllzrvr3wvn8x14k2hkrpyy1fm3crkn2y3plmr44fxwyg"; + sha256 = "19dyky67zkjichsb7ykhv0aqws3q0jfvzww76l66c19y6gh45k2h"; authors = [ "Manish Goregaokar " ]; @@ -11285,9 +11337,9 @@ rec { }; "zerofrom-derive" = rec { crateName = "zerofrom-derive"; - version = "0.1.5"; + version = "0.1.6"; edition = "2021"; - sha256 = "022q55phhb44qbrcfbc48k0b741fl8gnazw3hpmmndbx5ycfspjr"; + sha256 = "00l5niw7c1b0lf1vhvajpjmcnbdp2vn96jg4nmkhq2db0rp5s7np"; procMacro = true; libName = "zerofrom_derive"; authors = [ @@ -11304,7 +11356,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "fold" ]; } { @@ -11388,7 +11440,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.96"; + packageId = "syn 2.0.100"; features = [ "extra-traits" ]; } ]; diff --git a/rust/operator-binary/src/airflow_controller.rs b/rust/operator-binary/src/airflow_controller.rs index 15b33f9d..6cf88e15 100644 --- a/rust/operator-binary/src/airflow_controller.rs +++ b/rust/operator-binary/src/airflow_controller.rs @@ -696,13 +696,37 @@ fn build_rolegroup_config_map( vector_aggregator_address: Option<&str>, container: &Container, ) -> Result { - let mut config = rolegroup_config + let mut config: BTreeMap = BTreeMap::new(); + + // this will call default values + config::add_airflow_config(&mut config, authentication_config, authorization_config) + .context(ConstructConfigSnafu)?; + + tracing::debug!( + "Default config for {}: {:?}", + rolegroup.object_name(), + config + ); + + let mut file_config = rolegroup_config .get(&PropertyNameKind::File(AIRFLOW_CONFIG_FILENAME.to_string())) .cloned() .unwrap_or_default(); - config::add_airflow_config(&mut config, authentication_config, authorization_config) - .context(ConstructConfigSnafu)?; + tracing::debug!( + "Config overrides for {}: {:?}", + rolegroup.object_name(), + file_config + ); + + // now add any overrides, replacing any defaults + config.append(&mut file_config); + + tracing::debug!( + "Merged config for {}: {:?}", + rolegroup.object_name(), + config + ); let mut config_file = Vec::new(); diff --git a/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2 index f9dccdbb..b1cb7d07 100644 --- a/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2 +++ b/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2 @@ -52,6 +52,26 @@ spec: ROLE_HEADER_VAR = "role-value" EXPERIMENTAL_FILE_FOOTER: | ROLE_FOOTER_VAR = "role-value" + WTF_CSRF_ENABLED: "False" + AUTH_ROLES_SYNC_AT_LOGIN: "true" + AUTH_USER_REGISTRATION: "false" + AUTH_USER_REGISTRATION_ROLE: "Role" + OAUTH_PROVIDERS: | + [ + { 'name': 'azure', + 'icon': 'fa-windows', + 'token_key': 'access_token', + 'remote_app': { + 'client_id': os.environ.get('OIDC_XXX_CLIENT_ID'), + 'client_secret': os.environ.get('OIDC_XXX_CLIENT_SECRET'), + 'client_kwargs': { + 'scope': 'openid profile' + }, + 'api_base_url': 'https://keycloak/realms/sdp/protocol/test-url', + 'server_metadata_url': 'https://keycloak/realms/sdp/.well-known/openid-configuration-test', + }, + } + ] roleGroups: default: replicas: 1 @@ -59,6 +79,7 @@ spec: webserver_config.py: EXPERIMENTAL_FILE_HEADER: | COMMON_HEADER_VAR = "group-value" + AUTH_USER_REGISTRATION_ROLE: "Rolegroup" {% if test_scenario['values']['executor'] == 'celery' %} celeryExecutors: config: diff --git a/tests/templates/kuttl/smoke/41-assert.yaml b/tests/templates/kuttl/smoke/41-assert.yaml index 6169fd93..de4c98ff 100644 --- a/tests/templates/kuttl/smoke/41-assert.yaml +++ b/tests/templates/kuttl/smoke/41-assert.yaml @@ -19,3 +19,7 @@ commands: echo "$AIRFLOW_CONFIG" | grep 'COMMON_HEADER_VAR = "group-value"' echo "$AIRFLOW_CONFIG" | grep 'ROLE_FOOTER_VAR = "role-value"' echo "$AIRFLOW_CONFIG" | grep -v 'ROLE_HEADER_VAR = "role-value"' + echo "$AIRFLOW_CONFIG" | grep 'AUTH_ROLES_SYNC_AT_LOGIN = True' + echo "$AIRFLOW_CONFIG" | grep 'AUTH_USER_REGISTRATION = False' + echo "$AIRFLOW_CONFIG" | grep 'AUTH_USER_REGISTRATION_ROLE = "Rolegroup"' + echo "$AIRFLOW_CONFIG" | grep 'OAUTH_PROVIDERS' From f8dbd988348194628523366ac8cd7be0b1bccf6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Wed, 19 Mar 2025 16:11:17 +0100 Subject: [PATCH 2/4] Allow configuring the loglevel when using Tilt (and in principle in the helm chart as well). Default value is: "INFO" If nothing is set, Tilt defaults to an empty string, which is the default in Helm as well and leads to the environment var not being set on the Deployment, hence using the default from our code. This way we avoid creating multiple defaults in different places.. --- Tiltfile | 2 ++ deploy/helm/airflow-operator/templates/deployment.yaml | 4 ++++ deploy/helm/airflow-operator/values.yaml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/Tiltfile b/Tiltfile index fb84bcc0..ac47d53c 100644 --- a/Tiltfile +++ b/Tiltfile @@ -1,6 +1,7 @@ # If tilt_options.json exists read it and load the default_registry value from it settings = read_json('tilt_options.json', default={}) registry = settings.get('default_registry', 'oci.stackable.tech/sandbox') +loglevel = settings.get('loglevel', '') # Configure default registry either read from config file above, or with default value of "oci.stackable.tech/sandbox" default_registry(registry) @@ -35,6 +36,7 @@ helm_crds, helm_non_crds = filter_yaml( namespace="stackable-operators", set=[ 'image.repository=' + registry + '/' + operator_name, + 'logLevel=' + loglevel ], ), api_version = "^apiextensions\\.k8s\\.io/.*$", diff --git a/deploy/helm/airflow-operator/templates/deployment.yaml b/deploy/helm/airflow-operator/templates/deployment.yaml index 9562e490..845119ed 100644 --- a/deploy/helm/airflow-operator/templates/deployment.yaml +++ b/deploy/helm/airflow-operator/templates/deployment.yaml @@ -51,6 +51,10 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: {{ .Values.kubernetesClusterDomain | quote }} {{- end }} + {{- if .Values.logLevel }} + - name: AIRFLOW_OPERATOR_LOG + value: {{ .Values.logLevel | quote }} + {{- end }} volumes: - name: config-spec configMap: diff --git a/deploy/helm/airflow-operator/values.yaml b/deploy/helm/airflow-operator/values.yaml index 479a393b..c04fb302 100644 --- a/deploy/helm/airflow-operator/values.yaml +++ b/deploy/helm/airflow-operator/values.yaml @@ -42,6 +42,8 @@ tolerations: [] affinity: {} +logLevel: "" + # When running on a non-default Kubernetes cluster domain, the cluster domain can be configured here. # See the https://docs.stackable.tech/home/stable/guides/kubernetes-cluster-domain guide for details. # kubernetesClusterDomain: my-cluster.local From c441a30915c974f219d370b2798814080a1416c6 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Wed, 19 Mar 2025 18:04:53 +0100 Subject: [PATCH 3/4] revert tilt/log changes --- Tiltfile | 2 -- deploy/helm/airflow-operator/templates/deployment.yaml | 4 ---- deploy/helm/airflow-operator/values.yaml | 2 -- 3 files changed, 8 deletions(-) diff --git a/Tiltfile b/Tiltfile index ac47d53c..fb84bcc0 100644 --- a/Tiltfile +++ b/Tiltfile @@ -1,7 +1,6 @@ # If tilt_options.json exists read it and load the default_registry value from it settings = read_json('tilt_options.json', default={}) registry = settings.get('default_registry', 'oci.stackable.tech/sandbox') -loglevel = settings.get('loglevel', '') # Configure default registry either read from config file above, or with default value of "oci.stackable.tech/sandbox" default_registry(registry) @@ -36,7 +35,6 @@ helm_crds, helm_non_crds = filter_yaml( namespace="stackable-operators", set=[ 'image.repository=' + registry + '/' + operator_name, - 'logLevel=' + loglevel ], ), api_version = "^apiextensions\\.k8s\\.io/.*$", diff --git a/deploy/helm/airflow-operator/templates/deployment.yaml b/deploy/helm/airflow-operator/templates/deployment.yaml index 845119ed..9562e490 100644 --- a/deploy/helm/airflow-operator/templates/deployment.yaml +++ b/deploy/helm/airflow-operator/templates/deployment.yaml @@ -51,10 +51,6 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: {{ .Values.kubernetesClusterDomain | quote }} {{- end }} - {{- if .Values.logLevel }} - - name: AIRFLOW_OPERATOR_LOG - value: {{ .Values.logLevel | quote }} - {{- end }} volumes: - name: config-spec configMap: diff --git a/deploy/helm/airflow-operator/values.yaml b/deploy/helm/airflow-operator/values.yaml index c04fb302..479a393b 100644 --- a/deploy/helm/airflow-operator/values.yaml +++ b/deploy/helm/airflow-operator/values.yaml @@ -42,8 +42,6 @@ tolerations: [] affinity: {} -logLevel: "" - # When running on a non-default Kubernetes cluster domain, the cluster domain can be configured here. # See the https://docs.stackable.tech/home/stable/guides/kubernetes-cluster-domain guide for details. # kubernetesClusterDomain: my-cluster.local From c8141770fad7b9c2275342fe67dd54bf8127f8ee Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Thu, 20 Mar 2025 08:58:35 +0100 Subject: [PATCH 4/4] changelog --- CHANGELOG.md | 2 ++ rust/operator-binary/src/airflow_controller.rs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cc08036..4605a921 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - Fix `git-sync` functionality in case no `gitFolder` is specified. The `gitFolder` field is now non-nullable, but has a default value, resulting in no breaking change ([#596]). +- Fix configOverrides by applying after defaults ([#597]). [#557]: https://github.com/stackabletech/airflow-operator/pull/557 [#571]: https://github.com/stackabletech/airflow-operator/pull/571 @@ -32,6 +33,7 @@ [#573]: https://github.com/stackabletech/airflow-operator/pull/573 [#594]: https://github.com/stackabletech/airflow-operator/pull/594 [#596]: https://github.com/stackabletech/airflow-operator/pull/596 +[#597]: https://github.com/stackabletech/airflow-operator/pull/597 ## [24.11.1] - 2025-01-09 diff --git a/rust/operator-binary/src/airflow_controller.rs b/rust/operator-binary/src/airflow_controller.rs index 6cf88e15..f85da00d 100644 --- a/rust/operator-binary/src/airflow_controller.rs +++ b/rust/operator-binary/src/airflow_controller.rs @@ -698,7 +698,7 @@ fn build_rolegroup_config_map( ) -> Result { let mut config: BTreeMap = BTreeMap::new(); - // this will call default values + // this will call default values from AirflowClientAuthenticationDetails config::add_airflow_config(&mut config, authentication_config, authorization_config) .context(ConstructConfigSnafu)?;