-
Notifications
You must be signed in to change notification settings - Fork 256
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
fix(gateway): Ignore thrown errors from extendSchema
#478
Merged
+63
−6
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
134a637
Failing test
trevor-scheer adfab9c
Ignore errors thrown from extendSchema
trevor-scheer 477e756
Remove focus on test
trevor-scheer ca91c57
Update changelog
trevor-scheer 5f320ee
Add one more assertion to new test asserting that composeAndValidate …
trevor-scheer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -405,7 +405,12 @@ export function buildSchemaFromDefinitionsAndExtensions({ | |
}; | ||
|
||
errors = validateSDL(definitionsDocument, schema, compositionRules); | ||
schema = extendSchema(schema, definitionsDocument, { assumeValidSDL: true }); | ||
|
||
try { | ||
schema = extendSchema(schema, definitionsDocument, { | ||
assumeValidSDL: true, | ||
}); | ||
} catch (e) {} | ||
|
||
// Extend the schema with the extension definitions (as an AST node) | ||
const extensionsDocument: DocumentNode = { | ||
|
@@ -415,7 +420,11 @@ export function buildSchemaFromDefinitionsAndExtensions({ | |
|
||
errors.push(...validateSDL(extensionsDocument, schema, compositionRules)); | ||
|
||
schema = extendSchema(schema, extensionsDocument, { assumeValidSDL: true }); | ||
try { | ||
schema = extendSchema(schema, extensionsDocument, { | ||
assumeValidSDL: true, | ||
}); | ||
} catch {} | ||
|
||
// Remove federation directives from the final schema | ||
schema = new GraphQLSchema({ | ||
|
@@ -514,6 +523,7 @@ export function addFederationMetadataToSchemaNodes({ | |
// TODO: Why don't we need to check for non-object types here | ||
if (isObjectType(namedType)) { | ||
const field = namedType.getFields()[fieldName]; | ||
if (!field) break; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
||
const fieldFederationMetadata: FederationField = { | ||
...getFederationMetadata(field), | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As seen here in the new test case, when a type goes unrecognized, fields which return that type are abandoned. This handles the case where a field which is expected to exist cannot actually be found in the schema.