Skip to content

Update to router-bridge@0.6.0+v2.9.0 #5902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abernix merged 3 commits into from
Aug 28, 2024
Merged

Update to router-bridge@0.6.0+v2.9.0 #5902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
faf504a
Update to router-bridge@0.6.0+v2.9.0
tninesling Aug 27, 2024
0f52121
Merge branch '1.53.0' into tninesling/use-new-router-bridge
tninesling Aug 27, 2024
cc99121
Update fed version in redis test keys from beta to 2.9.0
tninesling Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 4 additions & 28 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ dependencies = [
"reqwest",
"rhai",
"rmp",
"router-bridge 0.6.0-beta.1+v2.9.0-beta.0",
"router-bridge",
"rowan",
"rstack",
"rust-embed",
Expand Down Expand Up @@ -5781,33 +5781,9 @@ dependencies = [

[[package]]
name = "router-bridge"
version = "0.5.31+v2.8.5"
version = "0.6.0+v2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "672901b1ec6fd110ac41d61ca5e1754319d0edf39546a089a114ab865d42ae97"
dependencies = [
"anyhow",
"async-channel 1.9.0",
"deno_console",
"deno_core",
"deno_url",
"deno_web",
"deno_webidl",
"rand 0.8.5",
"serde",
"serde_json",
"thiserror",
"tokio",
"tower",
"tower-service",
"tracing",
"which",
]

[[package]]
name = "router-bridge"
version = "0.6.0-beta.1+v2.9.0-beta.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "349dcc3134916c7888f2ebbb5c66fefa2693a1f9ff522e04672abb895b66cb9b"
checksum = "96ef4910ade6753863c8437a76e88e236ab91688dcfe739d73417ae7848f3b92"
dependencies = [
"anyhow",
"async-channel 1.9.0",
Expand Down Expand Up @@ -5842,7 +5818,7 @@ dependencies = [
"libfuzzer-sys",
"log",
"reqwest",
"router-bridge 0.5.31+v2.8.5",
"router-bridge",
"schemars",
"serde",
"serde_json",
Expand Down
2 changes: 1 addition & 1 deletion apollo-router/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ regex = "1.10.5"
reqwest.workspace = true

# note: this dependency should _always_ be pinned, prefix the version with an `=`
router-bridge = "=0.6.0-beta.1+v2.9.0-beta.0"
router-bridge = "=0.6.0+v2.9.0"

rust-embed = { version = "8.4.0", features = ["include-exclude"] }
rustls = "0.21.12"
Expand Down
14 changes: 7 additions & 7 deletions apollo-router/tests/integration/redis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ async fn query_planner_cache() -> Result<(), BoxError> {
// 2. run `docker compose up -d` and connect to the redis container by running `docker-compose exec redis /bin/bash`.
// 3. Run the `redis-cli` command from the shell and start the redis `monitor` command.
// 4. Run this test and yank the updated cache key from the redis logs.
let known_cache_key = "plan:0:v2.9.0-beta.0:16385ebef77959fcdc520ad507eb1f7f7df28f1d54a0569e3adabcb4cd00d7ce:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:8ecc6cbc98bab2769e6666a72ba47a4ebd90e6f62256ddcbdc7f352a805e0fe6";
let known_cache_key = "plan:0:v2.9.0:16385ebef77959fcdc520ad507eb1f7f7df28f1d54a0569e3adabcb4cd00d7ce:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:8ecc6cbc98bab2769e6666a72ba47a4ebd90e6f62256ddcbdc7f352a805e0fe6";

let config = RedisConfig::from_url("redis://127.0.0.1:6379").unwrap();
let client = RedisClient::new(config, None, None, None);
Expand Down Expand Up @@ -921,7 +921,7 @@ async fn connection_failure_blocks_startup() {
async fn query_planner_redis_update_query_fragments() {
test_redis_query_plan_config_update(
include_str!("fixtures/query_planner_redis_config_update_query_fragments.router.yaml"),
"plan:0:v2.9.0-beta.0:a9e605fa09adc5a4b824e690b4de6f160d47d84ede5956b58a7d300cca1f7204:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:cda2b4e476fdce9c4c435627b26cedd177cfbe04ab335fc3e3d895c0d79d965e",
"plan:0:v2.9.0:a9e605fa09adc5a4b824e690b4de6f160d47d84ede5956b58a7d300cca1f7204:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:cda2b4e476fdce9c4c435627b26cedd177cfbe04ab335fc3e3d895c0d79d965e",
)
.await;
}
Expand All @@ -940,7 +940,7 @@ async fn query_planner_redis_update_planner_mode() {
async fn query_planner_redis_update_introspection() {
test_redis_query_plan_config_update(
include_str!("fixtures/query_planner_redis_config_update_introspection.router.yaml"),
"plan:0:v2.9.0-beta.0:a9e605fa09adc5a4b824e690b4de6f160d47d84ede5956b58a7d300cca1f7204:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:259dd917e4de09b5469629849b91e8ffdfbed2587041fad68b5963369bb13283",
"plan:0:v2.9.0:a9e605fa09adc5a4b824e690b4de6f160d47d84ede5956b58a7d300cca1f7204:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:259dd917e4de09b5469629849b91e8ffdfbed2587041fad68b5963369bb13283",
)
.await;
}
Expand All @@ -949,7 +949,7 @@ async fn query_planner_redis_update_introspection() {
async fn query_planner_redis_update_defer() {
test_redis_query_plan_config_update(
include_str!("fixtures/query_planner_redis_config_update_defer.router.yaml"),
"plan:0:v2.9.0-beta.0:a9e605fa09adc5a4b824e690b4de6f160d47d84ede5956b58a7d300cca1f7204:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:e4376fe032160ce16399e520c6e815da6cb5cf4dc94a06175b86b64a9bf80201",
"plan:0:v2.9.0:a9e605fa09adc5a4b824e690b4de6f160d47d84ede5956b58a7d300cca1f7204:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:e4376fe032160ce16399e520c6e815da6cb5cf4dc94a06175b86b64a9bf80201",
)
.await;
}
Expand All @@ -960,7 +960,7 @@ async fn query_planner_redis_update_type_conditional_fetching() {
include_str!(
"fixtures/query_planner_redis_config_update_type_conditional_fetching.router.yaml"
),
"plan:0:v2.9.0-beta.0:a9e605fa09adc5a4b824e690b4de6f160d47d84ede5956b58a7d300cca1f7204:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:83d899fcb42d2202c39fc8350289b8247021da00ecf3d844553c190c49410507",
"plan:0:v2.9.0:a9e605fa09adc5a4b824e690b4de6f160d47d84ede5956b58a7d300cca1f7204:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:83d899fcb42d2202c39fc8350289b8247021da00ecf3d844553c190c49410507",
)
.await;
}
Expand All @@ -971,7 +971,7 @@ async fn query_planner_redis_update_reuse_query_fragments() {
include_str!(
"fixtures/query_planner_redis_config_update_reuse_query_fragments.router.yaml"
),
"plan:0:v2.9.0-beta.0:a9e605fa09adc5a4b824e690b4de6f160d47d84ede5956b58a7d300cca1f7204:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:d48f92f892bd67071694c0538a7e657ff8e0c52e1718f475190c17b503e9e8c3",
"plan:0:v2.9.0:a9e605fa09adc5a4b824e690b4de6f160d47d84ede5956b58a7d300cca1f7204:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:d48f92f892bd67071694c0538a7e657ff8e0c52e1718f475190c17b503e9e8c3",
)
.await;
}
Expand All @@ -994,7 +994,7 @@ async fn test_redis_query_plan_config_update(updated_config: &str, new_cache_key
router.assert_started().await;
router.clear_redis_cache().await;

let starting_key = "plan:0:v2.9.0-beta.0:a9e605fa09adc5a4b824e690b4de6f160d47d84ede5956b58a7d300cca1f7204:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:0966f1528d47cee30b6140a164be16148dd360ee10b87744991e9d35af8e8a27";
let starting_key = "plan:0:v2.9.0:a9e605fa09adc5a4b824e690b4de6f160d47d84ede5956b58a7d300cca1f7204:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:0966f1528d47cee30b6140a164be16148dd360ee10b87744991e9d35af8e8a27";
router.execute_default_query().await;
router.assert_redis_cache_contains(starting_key, None).await;
router.update_config(updated_config).await;
Expand Down
2 changes: 1 addition & 1 deletion fuzz/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ reqwest = { workspace = true, features = ["json", "blocking"] }
serde_json.workspace = true
tokio.workspace = true
# note: this dependency should _always_ be pinned, prefix the version with an `=`
router-bridge = "=0.5.31+v2.8.5"
router-bridge = "=0.6.0+v2.9.0"

[dev-dependencies]
anyhow = "1"
Expand Down