fix: include full @link directive definition (#352)

Add missing `Purpose` enum. Full `@link` definition as per the [spec](https://github.com/apollographql/specs/blob/main/link/v1.0/link-v1.0.graphql): ```graphql directive @link( url: String!, as: String, import: [Import], for: Purpose) repeatable on SCHEMA scalar Import enum Purpose { SECURITY EXECUTION } ``` Resolves: #351
apollographql · Sep 14, 2023 · c00e052 · c00e052
1 parent 4b8c6a1
commit c00e052
Show file tree

Hide file tree

Showing 18 changed files with 130 additions and 38 deletions.
diff --git a/graphql-java-support/src/main/java/com/apollographql/federation/graphqljava/Federation.java b/graphql-java-support/src/main/java/com/apollographql/federation/graphqljava/Federation.java
@@ -3,6 +3,7 @@
 import static com.apollographql.federation.graphqljava.directives.LinkDirectiveProcessor.loadFederationImportedDefinitions;
 
 import graphql.language.DirectiveDefinition;
+import graphql.language.EnumTypeDefinition;
 import graphql.language.FieldDefinition;
 import graphql.language.ObjectTypeDefinition;
 import graphql.language.SDLNamedDefinition;
@@ -160,16 +161,18 @@ private static RuntimeWiring ensureFederationV2DirectiveDefinitionsExist(
           if (def instanceof DirectiveDefinition
               && !typeRegistry.getDirectiveDefinition(def.getName()).isPresent()) {
             typeRegistry.add(def);
-          }
-          if (def instanceof ScalarTypeDefinition
-              && !runtimeWiring.getScalars().containsKey(def.getName())) {
+          } else if (def instanceof ScalarTypeDefinition
+              && !typeRegistry.scalars().containsKey(def.getName())) {
             typeRegistry.add(def);
             scalarTypesToAdd.add(
                 GraphQLScalarType.newScalar()
                     .name(def.getName())
                     .description(null)
                     .coercing(_Any.type.getCoercing())
                     .build());
+          } else if (def instanceof EnumTypeDefinition
+              && !typeRegistry.types().containsKey(def.getName())) {
+            typeRegistry.add(def);
           }
         });
 

diff --git a/.../java/com/apollographql/federation/graphqljava/directives/LinkImportsRenamingVisitor.java b/.../java/com/apollographql/federation/graphqljava/directives/LinkImportsRenamingVisitor.java
@@ -4,6 +4,7 @@
 
 import com.apollographql.federation.graphqljava.exceptions.UnsupportedRenameException;
 import graphql.language.DirectiveDefinition;
+import graphql.language.EnumTypeDefinition;
 import graphql.language.NamedNode;
 import graphql.language.Node;
 import graphql.language.NodeVisitorStub;
@@ -43,6 +44,9 @@ protected TraversalControl visitNode(Node node, TraverserContext<Node> context)
       } else if (node instanceof DirectiveDefinition) {
         String newName = newName(((NamedNode<?>) node).getName(), fed2Imports, true);
         newNode = ((DirectiveDefinition) node).transform(builder -> builder.name(newName));
+      } else if (node instanceof EnumTypeDefinition) {
+        String newName = newName(((NamedNode<?>) node).getName(), fed2Imports, true);
+        newNode = ((EnumTypeDefinition) node).transform(builder -> builder.name(newName));
       }
       if (newNode != null) {
         return changeNode(context, newNode);
@@ -78,7 +82,7 @@ private String newName(String name, Map<String, String> fed2Imports, boolean isD
     } else {
       if (name.equals("inaccessible") || name.equals("tag")) {
         return name;
-      } else if (name.equals("Import")) {
+      } else if (name.equals("Import") || name.equals("Purpose")) {
         return "link__" + name;
       } else {
         // apply default namespace

diff --git a/graphql-java-support/src/main/resources/definitions_fed2_0.graphqls b/graphql-java-support/src/main/resources/definitions_fed2_0.graphqls
@@ -40,7 +40,13 @@ scalar FieldSet
 directive @link(
     url: String!,
     as: String,
-    import: [Import])
+    import: [Import],
+    for: Purpose)
 repeatable on SCHEMA
 
 scalar Import
+
+enum Purpose {
+  SECURITY
+  EXECUTION
+}
diff --git a/graphql-java-support/src/main/resources/definitions_fed2_1.graphqls b/graphql-java-support/src/main/resources/definitions_fed2_1.graphqls
@@ -33,20 +33,26 @@ directive @tag(name: String!) repeatable on
     | INPUT_FIELD_DEFINITION
 scalar FieldSet
 
-#
-# federation-v2.1
-#
-
-directive @composeDirective(name: String!) repeatable on SCHEMA
-
 #
 # https://specs.apollo.dev/link/v1.0/link-v1.0.graphql
 #
 
 directive @link(
     url: String!,
     as: String,
-    import: [Import])
+    import: [Import],
+    for: Purpose)
 repeatable on SCHEMA
 
 scalar Import
+
+enum Purpose {
+  SECURITY
+  EXECUTION
+}
+
+#
+# federation-v2.1
+#
+
+directive @composeDirective(name: String!) repeatable on SCHEMA
diff --git a/graphql-java-support/src/main/resources/definitions_fed2_2.graphqls b/graphql-java-support/src/main/resources/definitions_fed2_2.graphqls
@@ -32,24 +32,30 @@ directive @tag(name: String!) repeatable on
     | INPUT_FIELD_DEFINITION
 scalar FieldSet
 
-#
-# federation-v2.1
-#
-
-directive @composeDirective(name: String!) repeatable on SCHEMA
-
 #
 # https://specs.apollo.dev/link/v1.0/link-v1.0.graphql
 #
 
 directive @link(
     url: String!,
     as: String,
-    import: [Import])
+    import: [Import],
+    for: Purpose)
 repeatable on SCHEMA
 
 scalar Import
 
+enum Purpose {
+  SECURITY
+  EXECUTION
+}
+
+#
+# federation-v2.1
+#
+
+directive @composeDirective(name: String!) repeatable on SCHEMA
+
 #
 # federation-v2.2
 #

diff --git a/graphql-java-support/src/main/resources/definitions_fed2_3.graphqls b/graphql-java-support/src/main/resources/definitions_fed2_3.graphqls
@@ -32,24 +32,30 @@ directive @tag(name: String!) repeatable on
     | INPUT_FIELD_DEFINITION
 scalar FieldSet
 
-#
-# federation-v2.1
-#
-
-directive @composeDirective(name: String!) repeatable on SCHEMA
-
 #
 # https://specs.apollo.dev/link/v1.0/link-v1.0.graphql
 #
 
 directive @link(
     url: String!,
     as: String,
-    import: [Import])
+    import: [Import],
+    for: Purpose)
 repeatable on SCHEMA
 
 scalar Import
 
+enum Purpose {
+  SECURITY
+  EXECUTION
+}
+
+#
+# federation-v2.1
+#
+
+directive @composeDirective(name: String!) repeatable on SCHEMA
+
 #
 # federation-v2.2
 #

diff --git a/graphql-java-support/src/main/resources/definitions_fed2_5.graphqls b/graphql-java-support/src/main/resources/definitions_fed2_5.graphqls
@@ -39,11 +39,17 @@ scalar FieldSet
 directive @link(
     url: String!,
     as: String,
-    import: [Import])
+    import: [Import],
+    for: Purpose)
 repeatable on SCHEMA
 
 scalar Import
 
+enum Purpose {
+  SECURITY
+  EXECUTION
+}
+
 #
 # federation-v2.1
 #

diff --git a/graphql-java-support/src/test/resources/schemas/authorization_federated.graphql b/graphql-java-support/src/test/resources/schemas/authorization_federated.graphql
@@ -24,7 +24,7 @@ directive @inaccessible on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINIT
 
 directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
 
-directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
+directive @link(as: String, for: link__Purpose, import: [link__Import], url: String!) repeatable on SCHEMA
 
 directive @requiresScopes(scopes: [[Scope!]!]!) on SCALAR | OBJECT | FIELD_DEFINITION | INTERFACE | ENUM
 
@@ -48,6 +48,11 @@ type _Service {
   sdl: String!
 }
 
+enum link__Purpose {
+  EXECUTION
+  SECURITY
+}
+
 scalar FieldSet
 
 scalar Scope

diff --git a/graphql-java-support/src/test/resources/schemas/composeDirective_federated.graphql b/graphql-java-support/src/test/resources/schemas/composeDirective_federated.graphql
@@ -22,7 +22,7 @@ directive @inaccessible on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINIT
 
 directive @key(fields: federation__FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
 
-directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
+directive @link(as: String, for: link__Purpose, import: [link__Import], url: String!) repeatable on SCHEMA
 
 directive @myDirective(foo: String!) on FIELD_DEFINITION
 
@@ -46,6 +46,11 @@ type _Service {
   sdl: String!
 }
 
+enum link__Purpose {
+  EXECUTION
+  SECURITY
+}
+
 scalar _Any
 
 scalar federation__FieldSet

diff --git a/graphql-java-support/src/test/resources/schemas/customAuthenticated_federated.graphql b/graphql-java-support/src/test/resources/schemas/customAuthenticated_federated.graphql
@@ -28,7 +28,7 @@ directive @inaccessible on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINIT
 
 directive @key(fields: federation__FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
 
-directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
+directive @link(as: String, for: link__Purpose, import: [link__Import], url: String!) repeatable on SCHEMA
 
 directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
@@ -50,6 +50,11 @@ type _Service {
   sdl: String!
 }
 
+enum link__Purpose {
+  EXECUTION
+  SECURITY
+}
+
 scalar _Any
 
 scalar federation__FieldSet

diff --git a/graphql-java-support/src/test/resources/schemas/extendSchema_federated.graphql b/graphql-java-support/src/test/resources/schemas/extendSchema_federated.graphql
@@ -18,7 +18,7 @@ directive @inaccessible on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINIT
 
 directive @key(fields: federation__FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
 
-directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
+directive @link(as: String, for: link__Purpose, import: [link__Import], url: String!) repeatable on SCHEMA
 
 directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
@@ -38,6 +38,11 @@ type _Service {
   sdl: String!
 }
 
+enum link__Purpose {
+  EXECUTION
+  SECURITY
+}
+
 scalar _Any
 
 scalar federation__FieldSet

diff --git a/graphql-java-support/src/test/resources/schemas/federationV2_federated.graphql b/graphql-java-support/src/test/resources/schemas/federationV2_federated.graphql
@@ -16,7 +16,7 @@ directive @interfaceObject on OBJECT
 
 directive @key(fields: federation__FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
 
-directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
+directive @link(as: String, for: link__Purpose, import: [link__Import], url: String!) repeatable on SCHEMA
 
 directive @override(from: String!) on FIELD_DEFINITION
 
@@ -92,6 +92,11 @@ type _Service {
   sdl: String!
 }
 
+enum link__Purpose {
+  EXECUTION
+  SECURITY
+}
+
 scalar _Any
 
 scalar federation__FieldSet

diff --git a/graphql-java-support/src/test/resources/schemas/interfaceEntity_federated.graphql b/graphql-java-support/src/test/resources/schemas/interfaceEntity_federated.graphql
@@ -22,7 +22,7 @@ directive @inaccessible on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINIT
 
 directive @key(fields: federation__FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
 
-directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
+directive @link(as: String, for: link__Purpose, import: [link__Import], url: String!) repeatable on SCHEMA
 
 directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
@@ -58,6 +58,11 @@ type _Service {
   sdl: String!
 }
 
+enum link__Purpose {
+  EXECUTION
+  SECURITY
+}
+
 scalar _Any
 
 scalar federation__FieldSet

diff --git a/graphql-java-support/src/test/resources/schemas/interfaceObject_federated.graphql b/graphql-java-support/src/test/resources/schemas/interfaceObject_federated.graphql
@@ -22,7 +22,7 @@ directive @interfaceObject on OBJECT
 
 directive @key(fields: federation__FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
 
-directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
+directive @link(as: String, for: link__Purpose, import: [link__Import], url: String!) repeatable on SCHEMA
 
 directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
@@ -43,6 +43,11 @@ type _Service {
   sdl: String!
 }
 
+enum link__Purpose {
+  EXECUTION
+  SECURITY
+}
+
 scalar _Any
 
 scalar federation__FieldSet

diff --git a/graphql-java-support/src/test/resources/schemas/nonResolvableKey_federated.graphql b/graphql-java-support/src/test/resources/schemas/nonResolvableKey_federated.graphql
@@ -22,7 +22,7 @@ directive @inaccessible on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINIT
 
 directive @key(fields: federation__FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
 
-directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
+directive @link(as: String, for: link__Purpose, import: [link__Import], url: String!) repeatable on SCHEMA
 
 directive @tag(name: String!) repeatable on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
@@ -48,6 +48,11 @@ type _Service {
   sdl: String!
 }
 
+enum link__Purpose {
+  EXECUTION
+  SECURITY
+}
+
 scalar _Any
 
 scalar federation__FieldSet

diff --git a/graphql-java-support/src/test/resources/schemas/renamedImports_federated.graphql b/graphql-java-support/src/test/resources/schemas/renamedImports_federated.graphql
@@ -10,7 +10,7 @@ directive @federation__requires(fields: federation__FieldSet!) on FIELD_DEFINITI
 
 directive @inaccessible on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
 
-directive @link(as: String, import: [link__Import], url: String!) repeatable on SCHEMA
+directive @link(as: String, for: link__Purpose, import: [link__Import], url: String!) repeatable on SCHEMA
 
 directive @myKey(fields: federation__FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
 
@@ -57,6 +57,11 @@ type _Service {
   sdl: String!
 }
 
+enum link__Purpose {
+  EXECUTION
+  SECURITY
+}
+
 scalar federation__FieldSet
 
 scalar link__Import