Skip to content

Add support for max batch size for connectors #7274

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
merged 13 commits into from
Apr 16, 2025
Merged

Add support for max batch size for connectors #7274

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
86f8a70
Add support for max batch size for connectors
andrewmcgivery Apr 15, 2025
7c8e794
Merge remote-tracking branch 'origin/dev' into feature/batchmaxsize
andrewmcgivery Apr 15, 2025
f21b62e
Fix test, update snapshots
andrewmcgivery Apr 15, 2025
ec56089
Add tests
andrewmcgivery Apr 15, 2025
d4bff47
Add spec definition for new batch argument
andrewmcgivery Apr 15, 2025
8a70021
Fix problem where entities weren't being properly mapped
andrewmcgivery Apr 15, 2025
dc7c801
Updated snapshots
andrewmcgivery Apr 15, 2025
37349de
Merge remote-tracking branch 'origin/dev' into feature/batchmaxsize
andrewmcgivery Apr 15, 2025
fc93954
Make `models` not pub, SourceBatchArguments -> ConnectBatchArguments,…
andrewmcgivery Apr 16, 2025
c86c612
Add integration tests
andrewmcgivery Apr 16, 2025
cd220f9
de-rustify batches so we can avoid a clone!
andrewmcgivery Apr 16, 2025
3b3a402
Merge remote-tracking branch 'origin/dev' into feature/batchmaxsize
andrewmcgivery Apr 16, 2025
cea1510
Merge remote-tracking branch 'origin/dev' into feature/batchmaxsize
andrewmcgivery Apr 16, 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
10 changes: 10 additions & 0 deletions apollo-federation/src/sources/connect/expand/tests/snapshots/connectors@batch.graphql.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ba
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"one_User_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -265,5 +270,10 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ba
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
}
15 changes: 15 additions & 0 deletions ...o-federation/src/sources/connect/expand/tests/snapshots/connectors@carryover.graphql.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ca
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"one_Query_t_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -388,6 +393,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ca
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"one_T_r_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -532,5 +542,10 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ca
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
}
15 changes: 15 additions & 0 deletions ...ation/src/sources/connect/expand/tests/snapshots/connectors@interface-object.graphql.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/in
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"connectors_Query_itfs_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -248,6 +253,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/in
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"connectors_Query_itf_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -408,5 +418,10 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/in
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
}
40 changes: 40 additions & 0 deletions apollo-federation/src/sources/connect/expand/tests/snapshots/connectors@keys.graphql.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ke
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"one_Query_t2_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -375,6 +380,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ke
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"one_Query_unselected_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -531,6 +541,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ke
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"one_T_r1_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -675,6 +690,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ke
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"one_T_r2_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -879,6 +899,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ke
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"one_T_r3_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -1067,6 +1092,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ke
},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"one_T_r4_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -1228,6 +1258,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ke
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"one_T_r5_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -1433,5 +1468,10 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ke
},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
}
5 changes: 5 additions & 0 deletions ...deration/src/sources/connect/expand/tests/snapshots/connectors@nested_inputs.graphql.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,5 +266,10 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ne
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
}
10 changes: 10 additions & 0 deletions ...ration/src/sources/connect/expand/tests/snapshots/connectors@normalize_names.graphql.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/no
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"connectors-subgraph_Query_user_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -235,5 +240,10 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/no
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
}
20 changes: 20 additions & 0 deletions ...o-federation/src/sources/connect/expand/tests/snapshots/connectors@realistic.graphql.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/re
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"connectors_Query_filterUsersByEmailDomain_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -476,6 +481,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/re
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"connectors_Query_usersByCompany_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -691,6 +701,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/re
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"connectors_Query_user_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -1055,5 +1070,10 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/re
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
}
10 changes: 10 additions & 0 deletions ...eration/src/sources/connect/expand/tests/snapshots/connectors@sibling_fields.graphql.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/si
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"connectors_T_b_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -251,5 +256,10 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/si
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
}
15 changes: 15 additions & 0 deletions apollo-federation/src/sources/connect/expand/tests/snapshots/connectors@simple.graphql.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/si
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"connectors_Query_user_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -235,6 +240,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/si
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"connectors_User_d_1": Connector {
id: ConnectId {
Expand Down Expand Up @@ -435,5 +445,10 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/si
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
}
15 changes: 15 additions & 0 deletions ...federation/src/sources/connect/expand/tests/snapshots/connectors@steelthread.graphql.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/st
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"connectors_Query_user_0": Connector {
id: ConnectId {
Expand Down Expand Up @@ -256,6 +261,11 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/st
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
"connectors_User_d_1": Connector {
id: ConnectId {
Expand Down Expand Up @@ -407,5 +417,10 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/st
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
}
5 changes: 5 additions & 0 deletions ...ation/src/sources/connect/expand/tests/snapshots/connectors@types_used_twice.graphql.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,5 +147,10 @@ input_file: apollo-federation/src/sources/connect/expand/tests/schemas/expand/ty
response_variables: {},
request_headers: {},
response_headers: {},
batch_settings: Some(
ConnectorBatchSettings {
max_size: None,
},
),
},
}
2 changes: 1 addition & 1 deletion apollo-federation/src/sources/connect/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub mod expand;
mod header;
mod id;
mod json_selection;
mod models;
pub mod models;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's selectively expose types as pub instead of marking the whole module as pub if possible

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

pub(crate) mod spec;
mod string_template;
mod url_template;
Expand Down
Loading