release: v1.57.1

.circleci/config.yml

@@ -1,5 +1,7 @@
 version: 2.1
 
+# Cache key bump: 1
+
 # These "CircleCI Orbs" are reusable bits of configuration that can be shared
 # across projects.  See https://circleci.com/orbs/ for more information.
 orbs:

CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to Router will be documented in this file.
 
 This project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html).
 
+# [1.57.1] - 2024-10-31
+
+## 🐛 Fixes
+
+### Progressive override: fix query planner cache warmup ([PR #6108](https://github.com/apollographql/router/pull/6108))
+
+This fixes an issue in progressive override where the override labels were not transmitted to the query planner during cache warmup. Queries were correctly using the overridden fields at first, but after an update, reverted to non overridden fields, and could not recover.
+
+By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/6108
+
+
+
 # [1.57.0] - 2024-10-22
 
 > [!IMPORTANT]

Cargo.lock

@@ -178,7 +178,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-federation"
-version = "1.57.0"
+version = "1.57.1"
 dependencies = [
  "apollo-compiler",
  "derive_more",
@@ -229,7 +229,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router"
-version = "1.57.0"
+version = "1.57.1"
 dependencies = [
  "access-json",
  "ahash",
@@ -397,7 +397,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-benchmarks"
-version = "1.57.0"
+version = "1.57.1"
 dependencies = [
  "apollo-parser",
  "apollo-router",
@@ -413,7 +413,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-scaffold"
-version = "1.57.0"
+version = "1.57.1"
 dependencies = [
  "anyhow",
  "cargo-scaffold",

apollo-federation/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "apollo-federation"
-version = "1.57.0"
+version = "1.57.1"
 authors = ["The Apollo GraphQL Contributors"]
 edition = "2021"
 description = "Apollo Federation"

apollo-router-benchmarks/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router-benchmarks"
-version = "1.57.0"
+version = "1.57.1"
 authors = ["Apollo Graph, Inc. <[email protected]>"]
 edition = "2021"
 license = "Elastic-2.0"

apollo-router-scaffold/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router-scaffold"
-version = "1.57.0"
+version = "1.57.1"
 authors = ["Apollo Graph, Inc. <[email protected]>"]
 edition = "2021"
 license = "Elastic-2.0"

apollo-router-scaffold/templates/base/Cargo.template.toml

@@ -22,7 +22,7 @@ apollo-router = { path ="{{integration_test}}apollo-router" }
 apollo-router = { git="https://github.com/apollographql/router.git", branch="{{branch}}" }
 {{else}}
 # Note if you update these dependencies then also update xtask/Cargo.toml
-apollo-router = "1.57.0"
+apollo-router = "1.57.1"
 {{/if}}
 {{/if}}
 async-trait = "0.1.52"

apollo-router-scaffold/templates/base/xtask/Cargo.template.toml

@@ -13,7 +13,7 @@ apollo-router-scaffold = { path ="{{integration_test}}apollo-router-scaffold" }
 {{#if branch}}
 apollo-router-scaffold = { git="https://github.com/apollographql/router.git", branch="{{branch}}" }
 {{else}}
-apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.57.0" }
+apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.57.1" }
 {{/if}}
 {{/if}}
 anyhow = "1.0.58"

apollo-router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router"
-version = "1.57.0"
+version = "1.57.1"
 authors = ["Apollo Graph, Inc. <[email protected]>"]
 repository = "https://github.com/apollographql/router/"
 documentation = "https://docs.rs/apollo-router"
@@ -62,7 +62,7 @@ features = ["docs_rs"]
 access-json = "0.1.0"
 anyhow = "1.0.86"
 apollo-compiler.workspace = true
-apollo-federation = { path = "../apollo-federation", version = "=1.57.0" }
+apollo-federation = { path = "../apollo-federation", version = "=1.57.1" }
 arc-swap = "1.6.0"
 async-channel = "1.9.0"
 async-compression = { version = "0.4.6", features = [

apollo-router/src/query_planner/caching_query_planner.rs

@@ -336,6 +336,11 @@ where
                     lock.insert(caching_key.metadata)
                 });
 
+                let _ = context.insert(
+                    LABELS_TO_OVERRIDE_KEY,
+                    caching_key.plan_options.override_conditions.clone(),
+                );
+
                 let request = QueryPlannerRequest {
                     query,
                     operation_name,

apollo-router/tests/samples/enterprise/progressive-override/basic/README.md

@@ -0,0 +1,3 @@
+# Progressive override
+
+This tests subgraph field migration: https://www.apollographql.com/docs/federation/entities/migrate-fields/

apollo-router/tests/samples/enterprise/progressive-override/basic/configuration.yaml

@@ -0,0 +1,13 @@
+include_subgraph_errors:
+  all: true
+
+telemetry:
+  exporters:
+    logging:
+      stdout:
+        format: text
+
+experimental_query_planner_mode: legacy
+
+plugins:
+  experimental.expose_query_plan: true

apollo-router/tests/samples/enterprise/progressive-override/basic/configuration2.yaml

@@ -0,0 +1,17 @@
+include_subgraph_errors:
+  all: true
+
+telemetry:
+  exporters:
+    logging:
+      stdout:
+        format: text
+
+experimental_query_planner_mode: legacy
+
+rhai:
+  scripts: "tests/samples/enterprise/progressive-override/basic/rhai"
+  main: "main.rhai"
+
+plugins:
+  experimental.expose_query_plan: true