Skip to content
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

Jump to bottom

Included tag directive in Apollo Federation import list #7421

Merged
merged 5 commits into from
Sep 30, 2024
Merged

Included tag directive in Apollo Federation import list #7421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00c461d
Included tag directive in Apollo Federation import list
glen-84 Sep 2, 2024
d62df7d
Merge branch 'main' into gai/issue-7413
glen-84 Sep 20, 2024
619bfce
Merge branch 'main' into gai/issue-7413
michaelstaib Sep 30, 2024
f0dda4d
Merge branch 'main' into gai/issue-7413
michaelstaib Sep 30, 2024
a2f1e87
Merge branch 'main' into gai/issue-7413
michaelstaib Sep 30, 2024
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
28 changes: 22 additions & 6 deletions src/HotChocolate/ApolloFederation/src/ApolloFederation/FederationTypeInterceptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ public override void OnAfterCompleteName(
ITypeCompletionContext completionContext,
DefinitionBase definition)
{
if (definition is not ITypeDefinition and not DirectiveTypeDefinition)
if (_context.GetFederationVersion() == FederationVersion.Federation10
|| definition is not ITypeDefinition and not DirectiveTypeDefinition)
{
return;
}
Expand Down Expand Up @@ -161,16 +162,18 @@ public override void OnAfterCompleteName(
if (type.IsDefined(typeof(PackageAttribute)))
{
RegisterImport(type);
return;
}

if (type == typeof(DirectiveType<Tag>))
{
RegisterTagImport();
}

return;

void RegisterImport(MemberInfo element)
{
if (_context.GetFederationVersion() == FederationVersion.Federation10)
{
return;
}

var package = element.GetCustomAttribute<PackageAttribute>();

if (package is null)
Expand All @@ -193,6 +196,19 @@ void RegisterImport(MemberInfo element)
types.Add(completionContext.Type.Name);
}
}

void RegisterTagImport()
{
var packageUrl = FederationVersion.Federation20.ToUrl();

if (!_imports.TryGetValue(packageUrl, out var types))
{
types = [];
_imports[packageUrl] = types;
}

types.Add($"@{completionContext.Type.Name}");
}
}

public override void OnTypesCompletedName()
Expand Down
2 changes: 1 addition & 1 deletion ...CertificationSchema/AnnotationBased/__snapshots__/CertificationTests.Schema_Snapshot.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@provides", "@external", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@tag", "@key", "@provides", "@external", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...ts/CertificationSchema/AnnotationBased/__snapshots__/CertificationTests.Subgraph_SDL.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@provides", "@external", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@tag", "@key", "@provides", "@external", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...Tests/CertificationSchema/CodeFirst/__snapshots__/CertificationTests.Schema_Snapshot.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@provides", "@external", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@provides", "@external", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...on.Tests/CertificationSchema/CodeFirst/__snapshots__/CertificationTests.Subgraph_SDL.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@provides", "@external", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@provides", "@external", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...es/__snapshots__/ComposeDirectiveTests.TestServiceTypeEmptyQueryTypePureCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @composeDirective(name: "custom") @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet", "@composeDirective" ]) @link(url: "https:\/\/specs.custom.dev\/custom\/v1.0", import: [ "@custom" ]) {
schema @composeDirective(name: "custom") @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet", "@composeDirective" ]) @link(url: "https:\/\/specs.custom.dev\/custom\/v1.0", import: [ "@custom" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...s/__snapshots__/ExternalDirectiveTests.AnnotateExternalToTypeFieldAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@external", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@external", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...ectives/__snapshots__/ExternalDirectiveTests.AnnotateExternalToTypeFieldCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@external", "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@external", "@key", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...ctives/__snapshots__/KeyDirectiveTests.AnnotateKeyToClassAttributeAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet" ]) {
query: QueryOfTestTypePropertyDirective
}

Expand Down
2 changes: 1 addition & 1 deletion ...tives/__snapshots__/KeyDirectiveTests.AnnotateKeyToClassAttributesAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet" ]) {
query: QueryOfTestTypePropertyDirectives
}

Expand Down
2 changes: 1 addition & 1 deletion ...s/__snapshots__/KeyDirectiveTests.AnnotateKeyToInterfaceAttributesAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet" ]) {
query: QueryOfTestTypeClassDirective
}

Expand Down
2 changes: 1 addition & 1 deletion ...ts/Directives/__snapshots__/KeyDirectiveTests.AnnotateKeyToInterfaceTypeCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...Directives/__snapshots__/KeyDirectiveTests.AnnotateKeyToObjectTypeAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet" ]) {
query: QueryOfTestTypeClassDirective
}

Expand Down
2 changes: 1 addition & 1 deletion ...Tests/Directives/__snapshots__/KeyDirectiveTests.AnnotateKeyToObjectTypeCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...shots__/NonResolvableKeyDirectiveTests.AnnotateKeyToClassAttributeAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet" ]) {
query: QueryOfTestTypePropertyDirective
}

Expand Down
2 changes: 1 addition & 1 deletion ...hots__/NonResolvableKeyDirectiveTests.AnnotateKeyToClassAttributesAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet" ]) {
query: QueryOfTestTypePropertyDirectives
}

Expand Down
2 changes: 1 addition & 1 deletion ...__/NonResolvableKeyDirectiveTests.AnnotateKeyToInterfaceAttributesAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet" ]) {
query: QueryOfTestTypeClassDirective
}

Expand Down
2 changes: 1 addition & 1 deletion .../__snapshots__/NonResolvableKeyDirectiveTests.AnnotateKeyToInterfaceTypeCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...snapshots__/NonResolvableKeyDirectiveTests.AnnotateKeyToObjectTypeAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet" ]) {
query: QueryOfTestTypeClassDirective
}

Expand Down
2 changes: 1 addition & 1 deletion ...ves/__snapshots__/NonResolvableKeyDirectiveTests.AnnotateKeyToObjectTypeCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...n.Tests/Directives/__snapshots__/OverrideDirectiveTests.OverrideDirective_Annotation.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.0", import: [ "@key", "@override", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.0", import: [ "@key", "@override", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...ctives/__snapshots__/OverrideDirectiveTests.OverrideDirective_Progressive_Annotation.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.7", import: [ "@key", "@override", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.7", import: [ "@key", "@override", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...__snapshots__/PolicyDirectiveTests.PolicyDirective_GetsAddedCorrectly_Annotations.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet", "@policy" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet", "@policy" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...__snapshots__/PolicyDirectiveTests.PolicyDirectives_GetAddedCorrectly_Annotations.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet", "@policy" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet", "@policy" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...s/__snapshots__/PolicyDirectiveTests.PolicyDirectives_GetAddedCorrectly_CodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@policy", "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@policy", "@key", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ..._snapshots__/ProvidesDirectiveTests.AnnotateProvidesToClassAttributePureCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@provides", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@provides", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion .../Directives/__snapshots__/ProvidesDirectiveTests.AnnotateProvidesToFieldCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@provides", "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@provides", "@key", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ..._snapshots__/RequiresDirectiveTests.AnnotateProvidesToClassAttributePureCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@requires", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@requires", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion .../Directives/__snapshots__/RequiresDirectiveTests.AnnotateProvidesToFieldCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@requires", "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@requires", "@key", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...quiresScopesDirectiveTests.RequiresScopesDirective_GetsAddedCorrectly_Annotations.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet", "@requiresScopes" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet", "@requiresScopes" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...quiresScopesDirectiveTests.RequiresScopesDirectives_GetAddedCorrectly_Annotations.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet", "@requiresScopes" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet", "@requiresScopes" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...RequiresScopesDirectiveTests.RequiresScopesDirectives_GetAddedCorrectly_CodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@requiresScopes", "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@requiresScopes", "@key", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
4 changes: 2 additions & 2 deletions src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/ServiceTypeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public async Task TestServiceTypeEmptyQueryTypePureCodeFirst()
.Parse((string)value!)
.MatchInlineSnapshot(
"""
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down Expand Up @@ -89,7 +89,7 @@ public async Task TestServiceTypeTypePureCodeFirst()
.Parse((string)value!)
.MatchInlineSnapshot(
"""
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.2", import: [ "@key", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.2", import: [ "@key", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...ation.Tests/__snapshots__/BuiltInTypesSharableTests.Ensure_PagingInfo_Is_Sharable.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@shareable", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@shareable", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
2 changes: 1 addition & 1 deletion ...TypesSharableTests.Ensure_PagingInfo_Is_Sharable_When_Sharable_Already_Registered.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@shareable", "FieldSet" ]) {
schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@shareable", "@tag", "FieldSet" ]) {
query: Query
}

Expand Down
Loading