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.

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

ApolloGateway: Construct and use RemoteGraphQLDataSource to issue introspection query to Federated Services #3120

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions __mocks__/apollo-server-env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import {
} from '../packages/apollo-server-env';

interface FetchMock extends jest.Mock<typeof fetch> {
mockResponseOnce(data?: any, headers?: HeadersInit, status?: number): void;
mockJSONResponseOnce(data?: object, headers?: HeadersInit): void;
mockResponseOnce(data?: any, headers?: HeadersInit, status?: number): this;
trevor-scheer marked this conversation as resolved.
Show resolved Hide resolved
mockJSONResponseOnce(data?: object, headers?: HeadersInit): this;
}

const mockFetch = jest.fn<typeof fetch>(fetch) as FetchMock;
Expand Down
1 change: 1 addition & 0 deletions packages/apollo-gateway/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
### vNEXT

* Optimize buildQueryPlan when two FetchGroups are on the same service [#3135](https://github.com/apollographql/apollo-server/pull/3135)
* Construct and use RemoteGraphQLDataSource to issue introspection query to Federated Services [#3120](https://github.com/apollographql/apollo-server/pull/3120)

# v0.9.0

Expand Down
113 changes: 113 additions & 0 deletions packages/apollo-gateway/src/__tests__/gateway/buildService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,116 @@ it('correctly passes the context from ApolloServer to datasources', async () =>
},
});
});

function createSdlData(sdl: string): object {
return {
data: {
_service: {
sdl: sdl,
},
},
};
}

it('makes enhanced introspection request using datasource', async () => {
fetch.mockJSONResponseOnce(
createSdlData('extend type Query { one: String }'),
);

const gateway = new ApolloGateway({
serviceList: [
{
name: 'one',
url: 'https://api.example.com/one',
},
],
buildService: service => {
return new RemoteGraphQLDataSource({
url: 'https://api.example.com/override',
willSendRequest: ({ request }) => {
request.http.headers.set('custom-header', 'some-custom-value');
},
});
},
});

await gateway.load();

expect(fetch).toBeCalledTimes(1);

expect(fetch).toHaveFetched({
url: 'https://api.example.com/override',
body: {
query: `query GetServiceDefinition { _service { sdl } }`,
},
headers: {
'custom-header': 'some-custom-value',
},
});
});

it('customizes request on a per-service basis', async () => {
fetch
.mockJSONResponseOnce(createSdlData('extend type Query { one: String }'))
.mockJSONResponseOnce(createSdlData('extend type Query { two: String }'))
.mockJSONResponseOnce(createSdlData('extend type Query { three: String }'));

const gateway = new ApolloGateway({
serviceList: [
{
name: 'one',
url: 'https://api.example.com/one',
},
{
name: 'two',
url: 'https://api.example.com/two',
},
{
name: 'three',
url: 'https://api.example.com/three',
},
],
buildService: service => {
return new RemoteGraphQLDataSource({
url: service.url,
willSendRequest: ({ request }) => {
request.http.headers.set('service-name', service.name);
},
});
},
});

await gateway.load();

expect(fetch).toBeCalledTimes(3);

expect(fetch).toHaveFetched({
url: 'https://api.example.com/one',
body: {
query: `query GetServiceDefinition { _service { sdl } }`,
},
headers: {
'service-name': 'one',
},
});

expect(fetch).toHaveFetched({
url: 'https://api.example.com/two',
body: {
query: `query GetServiceDefinition { _service { sdl } }`,
},
headers: {
'service-name': 'two',
},
});

expect(fetch).toHaveFetched({
url: 'https://api.example.com/three',
body: {
query: `query GetServiceDefinition { _service { sdl } }`,
},
headers: {
'service-name': 'three',
},
});
});
33 changes: 22 additions & 11 deletions packages/apollo-gateway/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -377,18 +377,24 @@ export class ApolloGateway implements GraphQLService {
this.pollingTimer.unref();
}

private createDataSource(
serviceDef: ServiceEndpointDefinition,
): GraphQLDataSource {
if (!serviceDef.url && !isLocalConfig(this.config)) {
throw new Error(
`Service definition for service ${serviceDef.name} is missing a url`,
);
}
return this.config.buildService
? this.config.buildService(serviceDef)
: new RemoteGraphQLDataSource({
url: serviceDef.url,
});
}

protected createServices(services: ServiceEndpointDefinition[]) {
for (const serviceDef of services) {
if (!serviceDef.url && !isLocalConfig(this.config)) {
throw new Error(
`Service definition for service ${serviceDef.name} is missing a url`,
);
}
this.serviceMap[serviceDef.name] = this.config.buildService
? this.config.buildService(serviceDef)
: new RemoteGraphQLDataSource({
url: serviceDef.url,
});
this.serviceMap[serviceDef.name] = this.createDataSource(serviceDef);
}
}

Expand All @@ -400,8 +406,13 @@ export class ApolloGateway implements GraphQLService {
}

if (isRemoteConfig(config)) {
const serviceList = config.serviceList.map(serviceDefinition => ({
...serviceDefinition,
dataSource: this.createDataSource(serviceDefinition),
}));

return getServiceDefinitionsFromRemoteEndpoint({
serviceList: config.serviceList,
serviceList,
...(config.introspectionHeaders
? { headers: config.introspectionHeaders }
: {}),
Expand Down
57 changes: 34 additions & 23 deletions packages/apollo-gateway/src/loadServicesFromRemoteEndpoint.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
import { ServiceDefinition } from '@apollo/federation';
import { GraphQLExecutionResult } from 'apollo-server-types';
import { GraphQLRequest } from 'apollo-server-types';
import { parse } from 'graphql';
import fetch, { HeadersInit } from 'node-fetch';
import { ServiceEndpointDefinition, UpdateServiceDefinitions } from './';
import { Headers, HeadersInit } from 'node-fetch';
import { GraphQLDataSource } from './datasources/types';
import { UpdateServiceDefinitions } from './';
import { ServiceDefinition } from '@apollo/federation';

let serviceDefinitionMap: Map<string, string> = new Map();

export async function getServiceDefinitionsFromRemoteEndpoint({
serviceList,
headers = {},
}: {
serviceList: ServiceEndpointDefinition[];
serviceList: {
name: string;
url?: string;
dataSource: GraphQLDataSource;
}[];
headers?: HeadersInit;
}): ReturnType<UpdateServiceDefinitions> {
if (!serviceList || !serviceList.length) {
Expand All @@ -22,31 +27,37 @@ export async function getServiceDefinitionsFromRemoteEndpoint({
let isNewSchema = false;
// for each service, fetch its introspection schema
const serviceDefinitions: ServiceDefinition[] = (await Promise.all(
serviceList.map(service => {
if (!service.url) {
mcohen75 marked this conversation as resolved.
Show resolved Hide resolved
throw new Error(
`Tried to load schema from ${service.name} but no url found`,
);
serviceList.map(({ name, url, dataSource }) => {
if (!url) {
throw new Error(`Tried to load schema from ${name} but no url found`);
}
return fetch(service.url, {
method: 'POST',
body: JSON.stringify({
query: 'query GetServiceDefinition { _service { sdl } }',
}),
headers: { 'Content-Type': 'application/json', ...headers },
})
.then(res => res.json())
.then(({ data, errors }: GraphQLExecutionResult) => {

const request: GraphQLRequest = {
query: 'query GetServiceDefinition { _service { sdl } }',
http: {
url,
method: 'POST',
headers: new Headers(headers),
},
};

return dataSource
.process({ request, context: {} })
.then(({ data, errors }) => {
if (data && !errors) {
const typeDefs = data._service.sdl as string;
const previousDefinition = serviceDefinitionMap.get(service.name);
const previousDefinition = serviceDefinitionMap.get(name);
// this lets us know if any downstream service has changed
// and we need to recalculate the schema
if (previousDefinition !== typeDefs) {
isNewSchema = true;
}
serviceDefinitionMap.set(service.name, typeDefs);
return { ...service, typeDefs: parse(typeDefs) };
serviceDefinitionMap.set(name, typeDefs);
return {
name,
url,
typeDefs: parse(typeDefs),
};
}

// XXX handle local errors better for local development
Expand All @@ -58,7 +69,7 @@ export async function getServiceDefinitionsFromRemoteEndpoint({
})
.catch(error => {
console.warn(
`Encountered error when loading ${service.name} at ${service.url}: ${error.message}`,
`Encountered error when loading ${name} at ${url}: ${error.message}`,
);
return false;
});
Expand Down