From ad34c0c7af61bd940e65bfc9b2f67469c4800ab7 Mon Sep 17 00:00:00 2001 From: sjaanus Date: Wed, 8 Jan 2025 09:34:42 +0200 Subject: [PATCH] Update --- Cargo.lock | 163 +++++++++++++++++---------------- server/Cargo.toml | 2 +- server/src/client_api.rs | 2 + server/src/feature_cache.rs | 1 + server/src/filters.rs | 5 + server/src/frontend_api.rs | 3 + server/src/http/broadcaster.rs | 3 + server/tests/redis_test.rs | 1 + server/tests/s3_tests.rs | 1 + server/tests/streaming_test.rs | 1 + 10 files changed, 102 insertions(+), 80 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d8bb5d7..6de72b26 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,7 +106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -260,7 +260,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -309,7 +309,7 @@ checksum = "4c221da13534b9352f3f79fcbbd6095f6d8aee63bdf1da8a73d36f9eeea17d5a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -463,7 +463,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -994,7 +994,7 @@ dependencies = [ "serde_json", "serde_repr", "serde_urlencoded", - "thiserror", + "thiserror 1.0.64", "tokio", "tokio-util", "tower-service", @@ -1158,7 +1158,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -1380,7 +1380,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -1391,7 +1391,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -1436,7 +1436,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -1457,7 +1457,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -1467,7 +1467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -1480,7 +1480,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -1500,7 +1500,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", "unicode-xid", ] @@ -1523,7 +1523,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -1780,7 +1780,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -2274,12 +2274,9 @@ checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "ipnetwork" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" -dependencies = [ - "serde", -] +checksum = "cf370abdafd54d13e54a620e8c3e1145f28e46cc9d704bc6d94414559df41763" [[package]] name = "is_debug" @@ -2651,7 +2648,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -2682,7 +2679,7 @@ dependencies = [ "futures-sink", "js-sys", "pin-project-lite", - "thiserror", + "thiserror 1.0.64", "tracing", ] @@ -2722,7 +2719,7 @@ dependencies = [ "rand", "serde", "serde_json", - "thiserror", + "thiserror 1.0.64", "tracing", ] @@ -2794,7 +2791,7 @@ dependencies = [ "regex", "regex-syntax 0.8.5", "structmeta", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -2811,20 +2808,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" +checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror", + "thiserror 2.0.9", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" +checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e" dependencies = [ "pest", "pest_generator", @@ -2832,22 +2829,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" +checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] name = "pest_meta" -version = "2.7.14" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" +checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" dependencies = [ "once_cell", "pest", @@ -2871,7 +2868,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -2963,7 +2960,7 @@ dependencies = [ "parking_lot", "procfs", "protobuf", - "thiserror", + "thiserror 1.0.64", ] [[package]] @@ -3011,7 +3008,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -3033,7 +3030,7 @@ dependencies = [ "rustc-hash", "rustls 0.23.19", "socket2", - "thiserror", + "thiserror 1.0.64", "tokio", "tracing", ] @@ -3050,7 +3047,7 @@ dependencies = [ "rustc-hash", "rustls 0.23.19", "slab", - "thiserror", + "thiserror 1.0.64", "tinyvec", "tracing", ] @@ -3300,7 +3297,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.82", + "syn 2.0.87", "walkdir", ] @@ -3524,9 +3521,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" [[package]] name = "serde" @@ -3545,7 +3542,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -3593,7 +3590,7 @@ dependencies = [ "futures", "percent-encoding", "serde", - "thiserror", + "thiserror 1.0.64", "tracing", ] @@ -3605,7 +3602,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -3647,7 +3644,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -3799,7 +3796,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -3810,7 +3807,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -3832,9 +3829,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.82" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -3902,7 +3899,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -3913,7 +3910,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", "test-case-core", ] @@ -3938,7 +3935,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 1.0.64", "tokio", "tokio-stream", "tokio-tar", @@ -3961,7 +3958,16 @@ version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.64", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] @@ -3972,7 +3978,18 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", ] [[package]] @@ -4070,7 +4087,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -4169,7 +4186,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -4242,7 +4259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -4404,24 +4421,12 @@ dependencies = [ "tracing-subscriber", "tracing-test", "ulid", - "unleash-types 0.15.3", + "unleash-types", "unleash-yggdrasil", "utoipa", "utoipa-swagger-ui", ] -[[package]] -name = "unleash-types" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fad3f40b62f88d6d623f3cdc6c73ea0a3dda4108db31bbcb31cd0d7fbaf1c57" -dependencies = [ - "chrono", - "derive_builder", - "serde", - "serde_json", -] - [[package]] name = "unleash-types" version = "0.15.3" @@ -4439,9 +4444,9 @@ dependencies = [ [[package]] name = "unleash-yggdrasil" -version = "0.14.1" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c654b3a246b3a77e537499674e791ba9d94250957c1c192302e063589e9ded9f" +checksum = "9e3e124cfc3c64ca53d499373f4c356c0576923065aeb6b03ebfdb03809ab207" dependencies = [ "chrono", "convert_case 0.6.0", @@ -4456,7 +4461,7 @@ dependencies = [ "semver", "serde", "serde_json", - "unleash-types 0.14.0", + "unleash-types", ] [[package]] @@ -4510,7 +4515,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -4607,7 +4612,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -4641,7 +4646,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4940,7 +4945,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.87", ] [[package]] @@ -4962,7 +4967,7 @@ dependencies = [ "flate2", "indexmap 2.6.0", "memchr", - "thiserror", + "thiserror 1.0.64", "zopfli", ] diff --git a/server/Cargo.toml b/server/Cargo.toml index e02a2511..3b2682dd 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -95,7 +95,7 @@ tracing = { version = "0.1.40", features = ["log"] } tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] } ulid = "1.1.2" unleash-types = { version = "0.15.3", features = ["openapi", "hashes"] } -unleash-yggdrasil = { version = "0.14.1" } +unleash-yggdrasil = { version = "0.14.3" } utoipa = { version = "5", features = ["actix_extras", "chrono"] } utoipa-swagger-ui = { version = "8", features = ["actix-web"] } [dev-dependencies] diff --git a/server/src/client_api.rs b/server/src/client_api.rs index c655a5ec..059b9a92 100644 --- a/server/src/client_api.rs +++ b/server/src/client_api.rs @@ -566,6 +566,7 @@ mod tests { ], segments: None, query: None, + meta: None, } } @@ -1301,6 +1302,7 @@ mod tests { }, ], segments: None, + meta: None, }; let mut dx_token = EdgeToken::from_str("dx:development.secret123").unwrap(); dx_token.status = TokenValidationStatus::Validated; diff --git a/server/src/feature_cache.rs b/server/src/feature_cache.rs index dec92097..5a29f108 100644 --- a/server/src/feature_cache.rs +++ b/server/src/feature_cache.rs @@ -99,6 +99,7 @@ fn update_client_features( s }), query: old.query.clone().or(update.query.clone()), + meta: None, } } diff --git a/server/src/filters.rs b/server/src/filters.rs index 74c08d1d..7501ba8a 100644 --- a/server/src/filters.rs +++ b/server/src/filters.rs @@ -48,6 +48,7 @@ pub(crate) fn filter_client_features( segments: feature_cache.segments.clone(), query: feature_cache.query.clone(), version: feature_cache.version, + meta: None, } } @@ -90,6 +91,7 @@ mod tests { }], query: None, segments: None, + meta: None, }; let map: DashMap = DashMap::default(); @@ -134,6 +136,7 @@ mod tests { ], query: None, segments: None, + meta: None, }; let map: DashMap = DashMap::default(); @@ -169,6 +172,7 @@ mod tests { ], query: None, segments: None, + meta: None, }; let map: DashMap = DashMap::default(); @@ -221,6 +225,7 @@ mod tests { ], query: None, segments: None, + meta: None, }; let map: DashMap = DashMap::default(); diff --git a/server/src/frontend_api.rs b/server/src/frontend_api.rs index a08c98ea..57b26957 100644 --- a/server/src/frontend_api.rs +++ b/server/src/frontend_api.rs @@ -857,6 +857,7 @@ mod tests { }], segments: None, query: None, + meta: None, } } @@ -885,6 +886,7 @@ mod tests { }], segments: None, query: None, + meta: None, } } @@ -908,6 +910,7 @@ mod tests { ], segments: None, query: None, + meta: None, } } diff --git a/server/src/http/broadcaster.rs b/server/src/http/broadcaster.rs index 8eaf6cd5..a1d21b50 100644 --- a/server/src/http/broadcaster.rs +++ b/server/src/http/broadcaster.rs @@ -293,6 +293,7 @@ mod test { features: vec![], query: None, segments: None, + meta: None, }, ); } @@ -325,6 +326,7 @@ mod test { }], segments: None, query: None, + meta: None, }, ); @@ -360,6 +362,7 @@ mod test { }], segments: None, query: None, + meta: None, }, ); diff --git a/server/tests/redis_test.rs b/server/tests/redis_test.rs index 8b68f2aa..945ff295 100644 --- a/server/tests/redis_test.rs +++ b/server/tests/redis_test.rs @@ -39,6 +39,7 @@ async fn redis_saves_and_restores_features_correctly() { query: None, segments: None, version: 2, + meta: None, }; let environment = "development"; redis_persister diff --git a/server/tests/s3_tests.rs b/server/tests/s3_tests.rs index 85ee792e..23b4c196 100644 --- a/server/tests/s3_tests.rs +++ b/server/tests/s3_tests.rs @@ -45,6 +45,7 @@ mod s3_tests { ], segments: None, query: None, + meta: None, }; let config = s3::config::Config::builder() .region(Region::new("us-east-1")) diff --git a/server/tests/streaming_test.rs b/server/tests/streaming_test.rs index 52845503..fd92feaa 100644 --- a/server/tests/streaming_test.rs +++ b/server/tests/streaming_test.rs @@ -89,6 +89,7 @@ mod streaming_test { environment: Some("development".into()), inline_segment_constraints: Some(false), }), + meta: None, }; let mut stream = es_client.stream();