Code-First Federation 2 Support

.github/workflows/test-code.yml

@@ -109,12 +109,24 @@ jobs:
  - name: Build Sample2
  working-directory: src
  run: dotnet build GraphQL.Federation.SchemaFirst.Sample2
+ - name: Build Sample3
+ working-directory: src
+ run: dotnet build GraphQL.Federation.CodeFirst.Sample3
+ - name: Build Sample4
+ working-directory: src
+ run: dotnet build GraphQL.Federation.TypeFirst.Sample4
  - name: Start Sample1 on port 5601
  working-directory: src
  run: dotnet run --no-build --project GraphQL.Federation.SchemaFirst.Sample1 &
  - name: Start Sample2 on port 5602
  working-directory: src
  run: dotnet run --no-build --project GraphQL.Federation.SchemaFirst.Sample2 &
+ - name: Start Sample3 on port 5603
+ working-directory: src
+ run: dotnet run --no-build --project GraphQL.Federation.CodeFirst.Sample3 &
+ - name: Start Sample4 on port 5604
+ working-directory: src
+ run: dotnet run --no-build --project GraphQL.Federation.TypeFirst.Sample4 &
  - name: Install Apollo Rover CLI
  run: |
  curl -sSL https://rover.apollo.dev/nix/latest | sh
@@ -152,6 +164,36 @@ jobs:
  done
  echo "Timed out after 30 seconds, step failed."
  exit 1
+ - name: Wait for Sample3 to spin up
+ run: |
+ for i in {1..60}
+ do
+ echo "Request $i to the URL..."
+ response=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:5603)
+ if [ $response -eq 200 ]; then
+ echo "Received 200 response, step completed."
+ exit 0
+ fi
+ echo "Did not receive a 200 response, sleeping for 0.5 second..."
+ sleep 0.5
+ done
+ echo "Timed out after 30 seconds, step failed."
+ exit 1
+ - name: Wait for Sample4 to spin up
+ run: |
+ for i in {1..60}
+ do
+ echo "Request $i to the URL..."
+ response=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:5604)
+ if [ $response -eq 200 ]; then
+ echo "Received 200 response, step completed."
+ exit 0
+ fi
+ echo "Did not receive a 200 response, sleeping for 0.5 second..."
+ sleep 0.5
+ done
+ echo "Timed out after 30 seconds, step failed."
+ exit 1
  - name: Build supergraph with federation-${{ matrix.federationversion }}-supergraph-config.yaml
  working-directory: src/Federation
  run: rover supergraph compose --config ./federation-${{ matrix.federationversion }}-supergraph-config.yaml --elv2-license=accept > supergraph.graphql
@@ -185,6 +227,11 @@ jobs:
  curl -X POST -H "Content-Type: application/json" -d @federation-request-1.json http://127.0.0.1:4000 > response-1.json
  curl -X POST -H "Content-Type: application/json" -d @federation-request-2.json http://127.0.0.1:4000 > response-2.json
  curl -X POST -H "Content-Type: application/json" -d @federation-request-3.json http://127.0.0.1:4000 > response-3.json
+ - name: Run additional GraphQL queries
+ if: matrix.federationversion == 2
+ working-directory: src/Federation
+ run: |
+ curl -X POST -H "Content-Type: application/json" -d @federation-request-4.json http://127.0.0.1:4000 > response-4.json
  - name: Print query result 1
  working-directory: src/Federation
  run: cat response-1.json
@@ -194,6 +241,10 @@ jobs:
  - name: Print query result 3
  working-directory: src/Federation
  run: cat response-3.json
+ - name: Print query result 4
+ if: matrix.federationversion == 2
+ working-directory: src/Federation
+ run: cat response-4.json
  - name: Compare query result 1 to expected response
  working-directory: src/Federation
  run: |
@@ -212,6 +263,13 @@ jobs:
  jq . response-3.json > actual-response-3.json
  jq . federation-response-3.json > expected-response-3.json
  diff -b actual-response-3.json expected-response-3.json
+ - name: Compare query result 4 to expected response
+ if: matrix.federationversion == 2
+ working-directory: src/Federation
+ run: |
+ jq . response-4.json > actual-response-4.json
+ jq . federation-response-4.json > expected-response-4.json
+ diff -b actual-response-4.json expected-response-4.json
 
  buildcheck:
  needs:

docs2/site/docs/migrations/migration8.md

@@ -605,7 +605,58 @@ Unless you directly implement these interfaces, you should not be impacted by th
 See the new features section for details on the new method added to this interface.
 Unless you directly implement this interface, you should not be impacted by this change.
 
-### 15. `AnyScalarType` moved to `GraphQL.Federation.Types`
+### 15. `AnyScalarType` and `ServiceGraphType` moved to `GraphQL.Federation.Types`
 
-`GraphQL.Utilities.Federation.AnyScalarType` has been moved to `GraphQL.Federation.Types.AnyScalarType`.
-All federation types are now located within the `GraphQL.Federation.Types` namespace.
+These graph types, previously located within the `GraphQL.Utilities.Federation` namespace,
+have been moved to the `GraphQL.Federation.Types` namespace alongside all other federation types.
+
+### 16. `IFederatedResolver`, `FuncFederatedResolver` and `ResolveReferenceAsync` replaced
+
+- `IFederatedResolver` has been replaced with `IFederationResolver`.
+- `FuncFederatedResolver` has been replaced with `FederationResolver`.
+- `ResolveReferenceAsync` has been replaced with `ResolveReference`.
+
+Please note that the new members are now located in the `GraphQL.Federation` namespace and may
+require slight changes to your code to accommodate the new signatures. The old members have been
+marked as obsolete and will continue to work in v8, but will be removed in v9.
+
+### 17. GraphQL Federation entity resolvers do not automatically inject `__typename` into requests.
+
+Previously, the `__typename` field was automatically injected into the request for entity resolvers.
+This behavior has been removed as it is not required to meet the GraphQL Federation specification.
+
+For instance, the following sample request:
+
+```graphql
+{
+ _entities(representations: [{ __typename: "User", id: "1" }]) {
+ ... on User {
+ id
+ }
+ }
+}
+```
+
+Should now be written as:
+
+```graphql
+{
+ _entities(representations: [{ __typename: "User", id: "1" }]) {
+ __typename
+ ... on User {
+ id
+ }
+ }
+}
+```
+
+Please ensure that your client requests are updated to include the `__typename` field in the response.
+Alternatively, you can install the provided `InjectTypenameValidationRule` validation rule to automatically
+inject the `__typename` field into the request.
+
+```cs
+services.AddGraphQL(b => b
+ .AddSchema<MySchema>()
+ // etc
+ .AddValidationRule<InjectTypenameValidationRule>());
+```

src/Federation/federation-2-supergraph-config.yaml

@@ -8,3 +8,11 @@ subgraphs:
  routing_url: http://localhost:5602/graphql
  schema:
  subgraph_url: http://localhost:5602/graphql
+ sample3:
+ routing_url: http://localhost:5603/graphql
+ schema:
+ subgraph_url: http://localhost:5603/graphql
+ sample4:
+ routing_url: http://localhost:5604/graphql
+ schema:
+ subgraph_url: http://localhost:5604/graphql

src/Federation/federation-request-4.json

@@ -0,0 +1,3 @@
+{
+ "query": "{ categories { id name products { id name category { id name } reviews { id content product { id name } author { id username reviews { id content } } } } } }"
+}

src/Federation/federation-response-4.json

@@ -0,0 +1,118 @@
+{
+ "data": {
+ "categories": [
+ {
+ "id": "1",
+ "name": "Category 1",
+ "products": [
+ {
+ "id": "1",
+ "name": "Product 1",
+ "category": {
+ "id": "1",
+ "name": "Category 1"
+ },
+ "reviews": [
+ {
+ "id": "1",
+ "content": "Review 1",
+ "product": {
+ "id": "1",
+ "name": "Product 1"
+ },
+ "author": {
+ "id": "1",
+ "username": "Username 1",
+ "reviews": [
+ {
+ "id": "1",
+ "content": "Review 1"
+ },
+ {
+ "id": "3",
+ "content": "Review 3"
+ }
+ ]
+ }
+ },
+ {
+ "id": "2",
+ "content": "Review 2",
+ "product": {
+ "id": "1",
+ "name": "Product 1"
+ },
+ "author": {
+ "id": "2",
+ "username": "Username 2",
+ "reviews": [
+ {
+ "id": "2",
+ "content": "Review 2"
+ }
+ ]
+ }
+ }
+ ]
+ },
+ {
+ "id": "2",
+ "name": "Product 2",
+ "category": {
+ "id": "1",
+ "name": "Category 1"
+ },
+ "reviews": [
+ {
+ "id": "3",
+ "content": "Review 3",
+ "product": {
+ "id": "2",
+ "name": "Product 2"
+ },
+ "author": {
+ "id": "1",
+ "username": "Username 1",
+ "reviews": [
+ {
+ "id": "1",
+ "content": "Review 1"
+ },
+ {
+ "id": "3",
+ "content": "Review 3"
+ }
+ ]
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "id": "2",
+ "name": "Category 2",
+ "products": [
+ {
+ "id": "3",
+ "name": "Product 3",
+ "category": {
+ "id": "2",
+ "name": "Category 2"
+ },
+ "reviews": []
+ },
+ {
+ "id": "4",
+ "name": "Product 4",
+ "category": {
+ "id": "2",
+ "name": "Category 2"
+ },
+ "reviews": []
+ }
+ ]
+ }
+ ]
+ }
+}