Skip to content

Revert #7316 #7725

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
carodewig merged 2 commits into from
Jun 18, 2025
Merged

Revert #7316 #7725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ed1c76
Revert "Move content negotiation to a plugin (#7316)"
carodewig Jun 18, 2025
cdc6478
Fix components
carodewig Jun 18, 2025
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
12 changes: 6 additions & 6 deletions apollo-router/src/axum_factory/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ use crate::http_server_factory::HttpServerFactory;
use crate::http_server_factory::HttpServerHandle;
use crate::json_ext::Path;
use crate::metrics::FutureMetricsExt;
use crate::plugins::content_negotiation::MULTIPART_DEFER_ACCEPT_HEADER_VALUE;
use crate::plugins::content_negotiation::MULTIPART_DEFER_CONTENT_TYPE_HEADER_VALUE;
use crate::plugins::healthcheck::Config as HealthCheck;
use crate::router_factory::Endpoint;
use crate::router_factory::RouterFactory;
use crate::services::MULTIPART_DEFER_ACCEPT;
use crate::services::MULTIPART_DEFER_CONTENT_TYPE;
use crate::services::RouterRequest;
use crate::services::RouterResponse;
use crate::services::SupergraphResponse;
Expand Down Expand Up @@ -1723,15 +1723,15 @@ async fn deferred_response_shape() -> Result<(), ApolloRouterError> {
let mut response = client
.post(&url)
.body(query.to_string())
.header(ACCEPT, MULTIPART_DEFER_ACCEPT_HEADER_VALUE)
.header(ACCEPT, HeaderValue::from_static(MULTIPART_DEFER_ACCEPT))
.send()
.await
.unwrap();

assert_eq!(response.status(), StatusCode::OK);
assert_eq!(
response.headers().get(CONTENT_TYPE),
Some(&MULTIPART_DEFER_CONTENT_TYPE_HEADER_VALUE)
Some(&HeaderValue::from_static(MULTIPART_DEFER_CONTENT_TYPE))
);

let first = response.chunk().await.unwrap().unwrap();
Expand Down Expand Up @@ -1783,15 +1783,15 @@ async fn multipart_response_shape_with_one_chunk() -> Result<(), ApolloRouterErr
let mut response = client
.post(&url)
.body(query.to_string())
.header(ACCEPT, MULTIPART_DEFER_ACCEPT_HEADER_VALUE)
.header(ACCEPT, HeaderValue::from_static(MULTIPART_DEFER_ACCEPT))
.send()
.await
.unwrap();

assert_eq!(response.status(), StatusCode::OK);
assert_eq!(
response.headers().get(CONTENT_TYPE),
Some(&MULTIPART_DEFER_CONTENT_TYPE_HEADER_VALUE)
Some(&HeaderValue::from_static(MULTIPART_DEFER_CONTENT_TYPE))
);

let first = response.chunk().await.unwrap().unwrap();
Expand Down
123 changes: 58 additions & 65 deletions ...r/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1342,8 +1342,8 @@ expression: "&schema"
"description": "Telemetry configuration",
"properties": {
"apollo": {
"$ref": "#/definitions/Config14",
"description": "#/definitions/Config14"
"$ref": "#/definitions/Config13",
"description": "#/definitions/Config13"
},
"exporters": {
"$ref": "#/definitions/Exporters",
Expand Down Expand Up @@ -1382,30 +1382,6 @@ expression: "&schema"
"type": "object"
},
"Config10": {
"additionalProperties": false,
"description": "Configuration for header propagation",
"properties": {
"all": {
"$ref": "#/definitions/HeadersLocation",
"description": "#/definitions/HeadersLocation",
"nullable": true
},
"connector": {
"$ref": "#/definitions/ConnectorHeadersConfiguration",
"description": "#/definitions/ConnectorHeadersConfiguration"
},
"subgraphs": {
"additionalProperties": {
"$ref": "#/definitions/HeadersLocation",
"description": "#/definitions/HeadersLocation"
},
"description": "Rules to specific subgraphs",
"type": "object"
}
},
"type": "object"
},
"Config11": {
"additionalProperties": false,
"description": "Configuration for exposing errors that originate from subgraphs",
"properties": {
Expand All @@ -1425,7 +1401,7 @@ expression: "&schema"
},
"type": "object"
},
"Config12": {
"Config11": {
"additionalProperties": false,
"description": "Configuration for entity caching",
"properties": {
Expand Down Expand Up @@ -1458,11 +1434,11 @@ expression: "&schema"
],
"type": "object"
},
"Config13": {
"Config12": {
"description": "Configuration for the progressive override plugin",
"type": "object"
},
"Config14": {
"Config13": {
"additionalProperties": false,
"properties": {
"batch_processor": {
Expand Down Expand Up @@ -1538,7 +1514,7 @@ expression: "&schema"
},
"type": "object"
},
"Config15": {
"Config14": {
"additionalProperties": false,
"properties": {
"batch_processor": {
Expand Down Expand Up @@ -1577,7 +1553,7 @@ expression: "&schema"
],
"type": "object"
},
"Config16": {
"Config15": {
"additionalProperties": false,
"description": "Prometheus configuration",
"properties": {
Expand All @@ -1602,7 +1578,7 @@ expression: "&schema"
},
"type": "object"
},
"Config17": {
"Config16": {
"additionalProperties": false,
"properties": {
"batch_processor": {
Expand All @@ -1623,7 +1599,7 @@ expression: "&schema"
],
"type": "object"
},
"Config18": {
"Config17": {
"additionalProperties": false,
"properties": {
"batch_processor": {
Expand Down Expand Up @@ -1682,7 +1658,7 @@ expression: "&schema"
],
"type": "object"
},
"Config19": {
"Config18": {
"additionalProperties": false,
"description": "Configuration for the experimental traffic shaping plugin",
"properties": {
Expand Down Expand Up @@ -1868,9 +1844,6 @@ expression: "&schema"
"type": "object"
},
"Config8": {
"type": "object"
},
"Config9": {
"additionalProperties": false,
"description": "Configuration for entity caching",
"properties": {
Expand Down Expand Up @@ -1903,6 +1876,30 @@ expression: "&schema"
],
"type": "object"
},
"Config9": {
"additionalProperties": false,
"description": "Configuration for header propagation",
"properties": {
"all": {
"$ref": "#/definitions/HeadersLocation",
"description": "#/definitions/HeadersLocation",
"nullable": true
},
"connector": {
"$ref": "#/definitions/ConnectorHeadersConfiguration",
"description": "#/definitions/ConnectorHeadersConfiguration"
},
"subgraphs": {
"additionalProperties": {
"$ref": "#/definitions/HeadersLocation",
"description": "#/definitions/HeadersLocation"
},
"description": "Rules to specific subgraphs",
"type": "object"
}
},
"type": "object"
},
"ConnectorAttributes": {
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -4500,12 +4497,12 @@ expression: "&schema"
"description": "#/definitions/MetricsCommon"
},
"otlp": {
"$ref": "#/definitions/Config15",
"description": "#/definitions/Config15"
"$ref": "#/definitions/Config14",
"description": "#/definitions/Config14"
},
"prometheus": {
"$ref": "#/definitions/Config16",
"description": "#/definitions/Config16"
"$ref": "#/definitions/Config15",
"description": "#/definitions/Config15"
}
},
"type": "object"
Expand Down Expand Up @@ -8208,24 +8205,24 @@ expression: "&schema"
"description": "#/definitions/TracingCommon"
},
"datadog": {
"$ref": "#/definitions/Config18",
"description": "#/definitions/Config18"
"$ref": "#/definitions/Config17",
"description": "#/definitions/Config17"
},
"experimental_response_trace_id": {
"$ref": "#/definitions/ExposeTraceId",
"description": "#/definitions/ExposeTraceId"
},
"otlp": {
"$ref": "#/definitions/Config15",
"description": "#/definitions/Config15"
"$ref": "#/definitions/Config14",
"description": "#/definitions/Config14"
},
"propagation": {
"$ref": "#/definitions/Propagation",
"description": "#/definitions/Propagation"
},
"zipkin": {
"$ref": "#/definitions/Config17",
"description": "#/definitions/Config17"
"$ref": "#/definitions/Config16",
"description": "#/definitions/Config16"
}
},
"type": "object"
Expand Down Expand Up @@ -9342,8 +9339,8 @@ expression: "&schema"
"type": "object"
},
"^experimental_response_cache$": {
"$ref": "#/definitions/Config9",
"description": "#/definitions/Config9"
"$ref": "#/definitions/Config8",
"description": "#/definitions/Config8"
}
},
"properties": {
Expand All @@ -9367,10 +9364,6 @@ expression: "&schema"
"$ref": "#/definitions/ConnectorsConfig",
"description": "#/definitions/ConnectorsConfig"
},
"content_negotiation": {
"$ref": "#/definitions/Config7",
"description": "#/definitions/Config7"
},
"coprocessor": {
"$ref": "#/definitions/Conf4",
"description": "#/definitions/Conf4"
Expand All @@ -9388,8 +9381,8 @@ expression: "&schema"
"description": "#/definitions/DemandControlConfig"
},
"enhanced_client_awareness": {
"$ref": "#/definitions/Config8",
"description": "#/definitions/Config8"
"$ref": "#/definitions/Config7",
"description": "#/definitions/Config7"
},
"experimental_chaos": {
"$ref": "#/definitions/Chaos",
Expand All @@ -9409,8 +9402,8 @@ expression: "&schema"
"description": "#/definitions/ForbidMutationsConfig"
},
"headers": {
"$ref": "#/definitions/Config10",
"description": "#/definitions/Config10"
"$ref": "#/definitions/Config9",
"description": "#/definitions/Config9"
},
"health_check": {
"$ref": "#/definitions/Config",
Expand All @@ -9421,8 +9414,8 @@ expression: "&schema"
"description": "#/definitions/Homepage"
},
"include_subgraph_errors": {
"$ref": "#/definitions/Config11",
"description": "#/definitions/Config11"
"$ref": "#/definitions/Config10",
"description": "#/definitions/Config10"
},
"license_enforcement": {
"$ref": "#/definitions/LicenseEnforcementConfig",
Expand All @@ -9445,16 +9438,16 @@ expression: "&schema"
"description": "#/definitions/Plugins"
},
"preview_entity_cache": {
"$ref": "#/definitions/Config12",
"description": "#/definitions/Config12"
"$ref": "#/definitions/Config11",
"description": "#/definitions/Config11"
},
"preview_file_uploads": {
"$ref": "#/definitions/FileUploadsConfig",
"description": "#/definitions/FileUploadsConfig"
},
"progressive_override": {
"$ref": "#/definitions/Config13",
"description": "#/definitions/Config13"
"$ref": "#/definitions/Config12",
"description": "#/definitions/Config12"
},
"rhai": {
"$ref": "#/definitions/Conf7",
Expand Down Expand Up @@ -9485,8 +9478,8 @@ expression: "&schema"
"description": "#/definitions/Tls"
},
"traffic_shaping": {
"$ref": "#/definitions/Config19",
"description": "#/definitions/Config19"
"$ref": "#/definitions/Config18",
"description": "#/definitions/Config18"
}
},
"title": "Configuration",
Expand Down
2 changes: 1 addition & 1 deletion apollo-router/src/plugins/authorization/authenticated.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ mod tests {
use crate::plugin::test::MockSubgraph;
use crate::plugins::authorization::APOLLO_AUTHENTICATION_JWT_CLAIMS;
use crate::plugins::authorization::authenticated::AuthenticatedVisitor;
use crate::plugins::content_negotiation::ClientRequestAccepts;
use crate::services::router::ClientRequestAccepts;
use crate::services::supergraph;
use crate::spec::query::transform;

Expand Down
Loading