Handle edge cases with subgraph extraction logic #3136
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🦋 Changeset detectedLatest commit: 9626d3d The changes in this PR will be included in the next version bump. This PR includes changesets to release 7 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
✅ Deploy Preview for apollo-federation-docs canceled.
|
|
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. |
sachindshinde
commented
Sep 3, 2024
| @@ -95,7 +103,27 @@ export function validateSupergraph(supergraph: Schema): [CoreFeatures, JoinSpecD | |||
| throw ERRORS.INVALID_FEDERATION_SUPERGRAPH.err( | |||
| `Invalid supergraph: uses unsupported join spec version ${joinFeature.url.version} (supported versions: ${JOIN_VERSIONS.versions().join(', ')})`); | |||
| } | |||
| return [coreFeatures, joinSpec]; | |||
|
|
|||
| const contextFeature = coreFeatures.getByIdentity(ContextSpecDefinition.identity); | |||
There was a problem hiding this comment.
This function seemed like the most natural place to fetch the context and core specs (if present), as it's also where we fetch the join spec (it's also the place we error if we do not know our own specs' versions).
| * when a custom directive's name conflicts with that of a default one. | ||
| */ | ||
| function getApolloDirectiveNames(supergraph: Schema): Record<string, string> { | ||
| const originalDirectiveNames: Record<string, string> = {}; |
There was a problem hiding this comment.
The logic in this function is already performed by FeatureDefinition.directive(), and there's a pre-existing pattern of adding helper methods to the spec's file to call FeatureDefinition.directive(). In this PR, we accordingly add costDirective() and listSizeDirective() to costSpec.ts.
Also, note the logic in this function:
- Is checking identity via
identity.includes("specs.apollo.dev")instead of strict equality. - Does not check for spec renaming via
as(which is separate from importas).
Shifting to FeatureDefinition.directive() will address these.
There was a problem hiding this comment.
@tninesling @sachindshinde to triple check, this fix was also mirrored in rust, right?
sachindshinde
added a commit
that referenced
this pull request
Sep 17, 2024
sachindshinde
added a commit
that referenced
this pull request
Sep 17, 2024
sachindshinde
added a commit
that referenced
this pull request
Sep 17, 2024
sachindshinde
pushed a commit
that referenced
this pull request
Sep 18, 2024
This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and the packages will be published to npm automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated. # Releases ## @apollo/composition@2.9.1 ### Patch Changes - Fix bugs in composition when merging nulls in directive applications and when handling renames. ([#3134](#3134)) - Updated dependencies \[[`b8e4ab5352a4dfd262af49493fdd42e86e5e3d99`](b8e4ab5), [`e6c05b6c96023aa3dec79889431f8217fcb3806d`](e6c05b6)]: - @apollo/federation-internals@2.9.1 - @apollo/query-graphs@2.9.1 ## @apollo/gateway@2.9.1 ### Patch Changes - Fix bugs in composition when merging nulls in directive applications and when handling renames. ([#3134](#3134)) - Updated dependencies \[[`b8e4ab5352a4dfd262af49493fdd42e86e5e3d99`](b8e4ab5), [`e6c05b6c96023aa3dec79889431f8217fcb3806d`](e6c05b6)]: - @apollo/federation-internals@2.9.1 - @apollo/composition@2.9.1 - @apollo/query-planner@2.9.1 ## @apollo/federation-internals@2.9.1 ### Patch Changes - Fix edge cases for subgraph extraction logic when using spec renaming or specs URLs that look similar to `specs.apollo.dev`. ([#3136](#3136)) - Fix bugs in composition when merging nulls in directive applications and when handling renames. ([#3134](#3134)) ## @apollo/query-graphs@2.9.1 ### Patch Changes - Updated dependencies \[[`b8e4ab5352a4dfd262af49493fdd42e86e5e3d99`](b8e4ab5), [`e6c05b6c96023aa3dec79889431f8217fcb3806d`](e6c05b6)]: - @apollo/federation-internals@2.9.1 ## @apollo/query-planner@2.9.1 ### Patch Changes - Updated dependencies \[[`b8e4ab5352a4dfd262af49493fdd42e86e5e3d99`](b8e4ab5), [`e6c05b6c96023aa3dec79889431f8217fcb3806d`](e6c05b6)]: - @apollo/federation-internals@2.9.1 - @apollo/query-graphs@2.9.1 ## @apollo/subgraph@2.9.1 ### Patch Changes - Updated dependencies \[[`b8e4ab5352a4dfd262af49493fdd42e86e5e3d99`](b8e4ab5), [`e6c05b6c96023aa3dec79889431f8217fcb3806d`](e6c05b6)]: - @apollo/federation-internals@2.9.1 ## apollo-federation-integration-testsuite@2.9.1 Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While reviewing recent code changes that released in
2.9.0, I noticed a few bugs in the code. This PR contains fixes for subgraph extraction bugs.Specifically, this PR updates subgraph extraction to use pre-existing functions/patterns instead of repeating logic, to avoid copy/pasting and bugs/divergence (the copied logic wasn't looking at spec renaming, for example).