-
Notifications
You must be signed in to change notification settings - Fork 254
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.
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
Preserves source of union members and enum values in supergraph #2288
Conversation
This pull request is automatically built and testable in CodeSandbox. To see build info of the built libraries, click here or the icon next to each commit SHA. |
I'll note that this PR is currently based on top of the #2279 PR. This is because that later PR was already adding the code to introduce a new |
Code LGTM, but can you add some tests to make sure that it's correct? Also for extractSubgraphsFromSupergraphs, ideally there would be tests that exercise both 0.3 and 0.2 functionality to make sure both paths work. |
151b502
to
7381f28
Compare
Mind being more specific about what you feel is inadequately tested? The patch adds support for correctly keeping the source of union members and enum values, and the patch currently:
I did just added a modification to the maint test checking a supergraph output so it includes unions and enum values, but the details of the supergraph are ultimately an implementation detail, so I don't want to over-index testing that.
Well, it's a bit tricky. The 0.3 version is well exercised by virtue of being the current version, but I agree we'd ideally want test ensuring that we can read 0.2 version properly. Except that while we preserve the reading of older versions, we don't preserve the writing of them, so to test this we need to generate supergraphs with older version and ensure they can still be read correctly on newer versions. It's probably doable, but a bit involved if we want this to not be too manual and unmaintainable. In any case, I'd like to tackle that question separately from this particular issue as it's more general. I've created #2297 with a possible initial, but I'm not entirely convinced yet. |
While composition allows unions and enums to differ between subgraphs (at least under certain conditions), the supergraph currently was not preserving which subgraph defined which union member/enum value, and in particular the query planner made the (sometimes incorrect) assumption that unions and enums were defined the same in all the subgraphs in which they are defined. As shown in apollographql#2256, this was leading to genuine issues in the case of unions, where the query planner was generating invalid subgraph queries. I am not sure this created similar issues for enum values due to a combination of how the merging rule for enum work and the fact that values of enum are not types, but it is nonetheless a bad idea to run the query planner with incorrect information on the subgraph it generates queries for, and this can get in the way of other toolings that wants to use the supergraph (for instance, this gets in the way of apollographql#2250). To fix this, this patch ensures the supergraph preserve the information regarding which subgraph defines which union member and enum values in the supergraph by adding 2 new dedicated "join spec" directives. Fixes apollographql#2256.
7381f28
to
0b083c6
Compare
* Implements @interfaceObject and @key on interfaces (#2279) Add support for the newly added `@interfaceObject` directive and for `@key` on interfaces, in order to allow using interfaces as abstraction across subgraphs. See #2277 for details. Fixes #2277. * Preserves source of union members and enum values in supergraph (#2288) While composition allows unions and enums to differ between subgraphs (at least under certain conditions), the supergraph currently was not preserving which subgraph defined which union member/enum value, and in particular the query planner made the (sometimes incorrect) assumption that unions and enums were defined the same in all the subgraphs in which they are defined. As shown in #2256, this was leading to genuine issues in the case of unions, where the query planner was generating invalid subgraph queries. I am not sure this created similar issues for enum values due to a combination of how the merging rule for enum work and the fact that values of enum are not types, but it is nonetheless a bad idea to run the query planner with incorrect information on the subgraph it generates queries for, and this can get in the way of other toolings that wants to use the supergraph (for instance, this gets in the way of #2250). To fix this, this patch ensures the supergraph preserve the information regarding which subgraph defines which union member and enum values in the supergraph by adding 2 new dedicated "join spec" directives. Fixes #2256. * Use alias in QP when querying conflicting fields (#2294) * Use alias in QP when querying conflicting fields In a few situations, the query planner was generating queries where the same response name was queried at the same "level" with incompatible types, resulting in invalid queries (the queries were failing the [`FieldsInSetCanMerge`](https://spec.graphql.org/draft/#FieldsInSetCanMerge())) validation for the GraphQL sepc). This commit detects this case, and when it would happen, aliases one of the occurence in the fetch to make the query valid. Once receiving the fetch result, the aliased value is rewritten to it's original response name. Fixes #1257 * Review feedback: add test for alias conflicts and fix related code * Regen error doc * Release - @apollo/composition@2.3.0-alpha.0 - apollo-federation-integration-testsuite@2.3.0-alpha.0 - @apollo/gateway@2.3.0-alpha.0 - @apollo/federation-internals@2.3.0-alpha.0 - @apollo/query-graphs@2.3.0-alpha.0 - @apollo/query-planner@2.3.0-alpha.0 - @apollo/subgraph@2.3.0-alpha.0 Co-authored-by: Sylvain Lebresne <sylvain@apollographql.com>
While composition allows unions and enums to differ between subgraphs (at least under certain conditions), the supergraph currently was not preserving which subgraph defined which union member/enum value, and in particular the query planner made the (sometimes incorrect) assumption that unions and enums were defined the same in all the subgraphs in which they are defined.
As shown in #2256, this was leading to genuine issues in the case of unions, where the query planner was generating invalid subgraph queries. I am not sure this created similar issues for enum values due to a combination of how the merging rule for enum work and the fact that values of enum are not types, but it is nonetheless a bad idea to run the query planner with incorrect information on the subgraph it generates queries for, and this can get in the way of other toolings that wants to use the supergraph (for instance, this gets in the way of #2250).
To fix this, this patch ensures the supergraph preserve the information regarding which subgraph defines which union member and enum values in the supergraph by adding 2 new dedicated "join spec" directives.