@apollo/gateway 0.46.0-alpha.0 → 0.48.1

package/dist/supergraphManagers/UplinkFetcher/loadSupergraphSdlFromStorage.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadSupergraphSdlFromStorage = exports.loadSupergraphSdlFromUplinks = exports.SUPERGRAPH_SDL_QUERY = void 0;
+exports.loadSupergraphSdlFromStorage = exports.loadSupergraphSdlFromUplinks = exports.UplinkFetcherError = exports.SUPERGRAPH_SDL_QUERY = void 0;
 const apollo_server_env_1 = require("apollo-server-env");
+const async_retry_1 = __importDefault(require("async-retry"));
 const outOfBandReporter_1 = require("./outOfBandReporter");
 exports.SUPERGRAPH_SDL_QUERY = `#graphql
   query SupergraphSdl($apiKey: String!, $ref: String!, $ifAfterId: ID) {
@@ -20,30 +24,24 @@ exports.SUPERGRAPH_SDL_QUERY = `#graphql
 `;
 const { name, version } = require('../../../package.json');
 const fetchErrorMsg = "An error occurred while fetching your schema from Apollo: ";
-let fetchCounter = 0;
-async function loadSupergraphSdlFromUplinks({ graphRef, apiKey, endpoints, errorReportingEndpoint, fetcher, compositionId, maxRetries, }) {
-    let retries = 0;
-    let lastException = null;
-    let result = null;
-    while (retries++ <= maxRetries && result == null) {
-        try {
-            result = await loadSupergraphSdlFromStorage({
-                graphRef,
-                apiKey,
-                endpoint: endpoints[fetchCounter++ % endpoints.length],
-                errorReportingEndpoint,
-                fetcher,
-                compositionId
-            });
-        }
-        catch (e) {
-            lastException = e;
-        }
-    }
-    if (result === null && lastException !== null) {
-        throw lastException;
+class UplinkFetcherError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'UplinkFetcherError';
     }
-    return result;
+}
+exports.UplinkFetcherError = UplinkFetcherError;
+async function loadSupergraphSdlFromUplinks({ graphRef, apiKey, endpoints, errorReportingEndpoint, fetcher, compositionId, maxRetries, roundRobinSeed, }) {
+    return (0, async_retry_1.default)(() => loadSupergraphSdlFromStorage({
+        graphRef,
+        apiKey,
+        endpoint: endpoints[roundRobinSeed++ % endpoints.length],
+        errorReportingEndpoint,
+        fetcher,
+        compositionId,
+    }), {
+        retries: maxRetries,
+    });
 }
 exports.loadSupergraphSdlFromUplinks = loadSupergraphSdlFromUplinks;
 async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, errorReportingEndpoint, fetcher, compositionId, }) {
@@ -81,7 +79,7 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, errorR
             endedAt: endTime,
             fetcher,
         });
-        throw new Error(fetchErrorMsg + ((_a = e.message) !== null && _a !== void 0 ? _a : e));
+        throw new UplinkFetcherError(fetchErrorMsg + ((_a = e.message) !== null && _a !== void 0 ? _a : e));
     }
     const endTime = new Date();
     let response;
@@ -90,15 +88,15 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, errorR
             response = await result.json();
         }
         catch (e) {
-            throw new Error((_b = fetchErrorMsg + result.status + ' ' + e.message) !== null && _b !== void 0 ? _b : e);
+            throw new UplinkFetcherError((_b = fetchErrorMsg + result.status + ' ' + e.message) !== null && _b !== void 0 ? _b : e);
         }
         if ('errors' in response) {
-            throw new Error([fetchErrorMsg, ...response.errors.map((error) => error.message)].join('\n'));
+            throw new UplinkFetcherError([fetchErrorMsg, ...response.errors.map((error) => error.message)].join('\n'));
         }
     }
     else {
         await (0, outOfBandReporter_1.submitOutOfBandReportIfConfigured)({
-            error: new Error(fetchErrorMsg + result.status + ' ' + result.statusText),
+            error: new UplinkFetcherError(fetchErrorMsg + result.status + ' ' + result.statusText),
             request,
             endpoint: errorReportingEndpoint,
             response: result,
@@ -106,7 +104,7 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, errorR
             endedAt: endTime,
             fetcher,
         });
-        throw new Error(fetchErrorMsg + result.status + ' ' + result.statusText);
+        throw new UplinkFetcherError(fetchErrorMsg + result.status + ' ' + result.statusText);
     }
     const { routerConfig } = response.data;
     if (routerConfig.__typename === 'RouterConfigResult') {
@@ -115,13 +113,13 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, errorR
     }
     else if (routerConfig.__typename === 'FetchError') {
         const { code, message } = routerConfig;
-        throw new Error(`${code}: ${message}`);
+        throw new UplinkFetcherError(`${code}: ${message}`);
     }
     else if (routerConfig.__typename === 'Unchanged') {
         return null;
     }
     else {
-        throw new Error('Programming error: unhandled response failure');
+        throw new UplinkFetcherError('Programming error: unhandled response failure');
     }
 }
 exports.loadSupergraphSdlFromStorage = loadSupergraphSdlFromStorage;

package/dist/supergraphManagers/UplinkFetcher/loadSupergraphSdlFromStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadSupergraphSdlFromStorage.js","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkFetcher/loadSupergraphSdlFromStorage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loadSupergraphSdlFromStorage.js","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkFetcher/loadSupergraphSdlFromStorage.ts"],"names":[],"mappings":"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"}

package/dist/supergraphManagers/index.d.ts

@@ -2,4 +2,5 @@ export { LocalCompose } from './LocalCompose';
 export { LegacyFetcher } from './LegacyFetcher';
 export { IntrospectAndCompose } from './IntrospectAndCompose';
 export { UplinkFetcher } from './UplinkFetcher';
+export { UplinkFetcherError } from './UplinkFetcher/loadSupergraphSdlFromStorage';
 //# sourceMappingURL=index.d.ts.map

package/dist/supergraphManagers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/supergraphManagers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/supergraphManagers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAA"}

package/dist/supergraphManagers/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UplinkFetcher = exports.IntrospectAndCompose = exports.LegacyFetcher = exports.LocalCompose = void 0;
+exports.UplinkFetcherError = exports.UplinkFetcher = exports.IntrospectAndCompose = exports.LegacyFetcher = exports.LocalCompose = void 0;
 var LocalCompose_1 = require("./LocalCompose");
 Object.defineProperty(exports, "LocalCompose", { enumerable: true, get: function () { return LocalCompose_1.LocalCompose; } });
 var LegacyFetcher_1 = require("./LegacyFetcher");
@@ -9,4 +9,6 @@ var IntrospectAndCompose_1 = require("./IntrospectAndCompose");
 Object.defineProperty(exports, "IntrospectAndCompose", { enumerable: true, get: function () { return IntrospectAndCompose_1.IntrospectAndCompose; } });
 var UplinkFetcher_1 = require("./UplinkFetcher");
 Object.defineProperty(exports, "UplinkFetcher", { enumerable: true, get: function () { return UplinkFetcher_1.UplinkFetcher; } });
+var loadSupergraphSdlFromStorage_1 = require("./UplinkFetcher/loadSupergraphSdlFromStorage");
+Object.defineProperty(exports, "UplinkFetcherError", { enumerable: true, get: function () { return loadSupergraphSdlFromStorage_1.UplinkFetcherError; } });
 //# sourceMappingURL=index.js.map

package/dist/supergraphManagers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/supergraphManagers/index.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAArC,4GAAA,YAAY,OAAA;AACrB,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,+DAA8D;AAArD,4HAAA,oBAAoB,OAAA;AAC7B,iDAAgD;AAAvC,8GAAA,aAAa,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/supergraphManagers/index.ts"],"names":[],"mappings":";;;AAAA,+CAA8C;AAArC,4GAAA,YAAY,OAAA;AACrB,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,+DAA8D;AAArD,4HAAA,oBAAoB,OAAA;AAC7B,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,6FAAiF;AAAxE,kIAAA,kBAAkB,OAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/gateway",
-  "version": "0.46.0-alpha.0",
+  "version": "0.48.1",
   "description": "Apollo Gateway",
   "author": "Apollo <packages@apollographql.com>",
   "main": "dist/index.js",
@@ -26,25 +26,26 @@
   },
   "dependencies": {
     "@apollo/core-schema": "^0.2.0",
-    "@apollo/federation": "^0.33.8",
-    "@apollo/query-planner": "^0.6.4-alpha.0",
+    "@apollo/federation": "^0.35.1",
+    "@apollo/query-planner": "^0.8.0",
     "@josephg/resolvable": "^1.0.1",
     "@opentelemetry/api": "^1.0.1",
     "@types/node-fetch": "2.5.12",
-    "apollo-graphql": "^0.9.5",
-    "apollo-reporting-protobuf": "^0.8.0 || ^3.0.0 || ^3.3.0-alpha.0",
+    "apollo-reporting-protobuf": "^0.8.0 || ^3.0.0",
     "apollo-server-caching": "^0.7.0 || ^3.0.0",
-    "apollo-server-core": "^2.23.0 || ^3.0.0 || ^3.6.0-alpha.0",
+    "apollo-server-core": "^2.23.0 || ^3.0.0",
     "apollo-server-env": "^3.0.0 || ^4.0.0",
     "apollo-server-errors": "^2.5.0 || ^3.0.0",
-    "apollo-server-types": "^0.9.0 || ^3.0.0 || ^3.5.0-alpha.0",
+    "apollo-server-types": "^0.9.0 || ^3.0.0",
+    "apollo-utilities": "^1.3.0",
+    "async-retry": "^1.3.3",
     "loglevel": "^1.6.1",
     "make-fetch-happen": "^8.0.0",
-    "pretty-format": "^27.3.1",
+    "pretty-format": "^27.4.6",
     "sha.js": "^2.4.11"
   },
   "peerDependencies": {
-    "graphql": "^15.7.2"
+    "graphql": "^15.8.0 || ^16.0.0"
   },
-  "gitHead": "880b65fb904f39193a978998ae24ec07e026db16"
+  "gitHead": "50e54e6480a863891e28e44e4d7510b3c31d845f"
 }

package/src/__mocks__/make-fetch-happen-fetcher.ts

@@ -20,6 +20,7 @@ interface MakeFetchHappenMock extends jest.MockedFunction<typeof fetch> {
 }
 
 const mockMakeFetchHappen = jest.fn(fetcher) as unknown as MakeFetchHappenMock;
+const defaults = () => mockMakeFetchHappen;
 
 mockMakeFetchHappen.mockResponseOnce = (
   data?: BodyInit,
@@ -47,7 +48,8 @@ mockMakeFetchHappen.mockJSONResponseOnce = (
 };
 
 const makeFetchMock = {
-  makeFetchHappenFetcher: mockMakeFetchHappen,
+  fetch: mockMakeFetchHappen,
+  defaults,
 };
 
 jest.doMock('make-fetch-happen', () => makeFetchMock);

package/src/__tests__/executeQueryPlan.test.ts

@@ -5,7 +5,6 @@ import {
   GraphQLSchema,
   print,
 } from 'graphql';
-import { addResolversToSchema, GraphQLResolverMap } from 'apollo-graphql';
 import gql from 'graphql-tag';
 import { GraphQLRequestContext, VariableValues } from 'apollo-server-types';
 import { AuthenticationError } from 'apollo-server-core';
@@ -21,6 +20,7 @@ import { buildComposedSchema, QueryPlanner } from '@apollo/query-planner';
 import { ApolloGateway } from '..';
 import { ApolloServerBase as ApolloServer } from 'apollo-server-core';
 import { getFederatedTestingSchema } from './execution-utils';
+import { addResolversToSchema, GraphQLResolverMap } from '../schema-helper';
 
 expect.addSnapshotSerializer(astSerializer);
 expect.addSnapshotSerializer(queryPlanSerializer);

package/src/__tests__/execution-utils.ts

@@ -2,7 +2,7 @@ import {
   GraphQLSchemaValidationError,
   GraphQLSchemaModule,
   GraphQLResolverMap,
-} from 'apollo-graphql';
+} from '../schema-helper';
 import { GraphQLRequest, GraphQLExecutionResult, Logger } from 'apollo-server-types';
 import {
   composeAndValidate,

package/src/__tests__/gateway/buildService.test.ts

@@ -1,4 +1,4 @@
-import { fetch } from '../../__mocks__/apollo-server-env';
+import { fetch } from '../../__mocks__/make-fetch-happen-fetcher';
 import { ApolloServerBase as ApolloServer } from 'apollo-server-core';
 
 import { RemoteGraphQLDataSource } from '../../datasources/RemoteGraphQLDataSource';

package/src/__tests__/gateway/endToEnd.test.ts

@@ -1,10 +1,10 @@
-import { GraphQLSchemaModule } from 'apollo-graphql';
 import { buildSubgraphSchema } from '@apollo/subgraph';
 import { ApolloServer } from 'apollo-server';
 import fetch from 'node-fetch';
 import { ApolloGateway } from '../..';
 import { fixtures } from 'apollo-federation-integration-testsuite';
 import { ApolloServerPluginInlineTrace } from 'apollo-server-core';
+import { GraphQLSchemaModule } from '../../schema-helper';
 
 async function startFederatedServer(modules: GraphQLSchemaModule[]) {
   const schema = buildSubgraphSchema(modules);

package/src/__tests__/gateway/executor.test.ts

@@ -1,8 +1,8 @@
+import { fetch } from '../../__mocks__/make-fetch-happen-fetcher';
 import gql from 'graphql-tag';
 import { ApolloGateway } from '../../';
 import { fixtures } from 'apollo-federation-integration-testsuite';
 import { Logger } from 'apollo-server-types';
-import { fetch } from '../../__mocks__/apollo-server-env';
 
 let logger: {
   warn: jest.MockedFunction<Logger['warn']>,

package/src/__tests__/gateway/reporting.test.ts

@@ -1,12 +1,8 @@
 import { gunzipSync } from 'zlib';
 import nock from 'nock';
-import { GraphQLSchemaModule } from 'apollo-graphql';
-import gql from 'graphql-tag';
 import { buildSubgraphSchema } from '@apollo/subgraph';
 import { ApolloServer } from 'apollo-server';
 import { ApolloServerPluginUsageReporting } from 'apollo-server-core';
-import { execute, toPromise } from 'apollo-link';
-import { createHttpLink } from 'apollo-link-http';
 import fetch from 'node-fetch';
 import { ApolloGateway } from '../..';
 import { Plugin, Config, Refs } from 'pretty-format';
@@ -14,6 +10,7 @@ import { Report, Trace } from 'apollo-reporting-protobuf';
 import { fixtures } from 'apollo-federation-integration-testsuite';
 import { nockAfterEach, nockBeforeEach } from '../nockAssertions';
 import resolvable, { Resolvable } from '@josephg/resolvable';
+import { GraphQLSchemaModule } from '../../schema-helper';
 
 // Normalize specific fields that change often (eg timestamps) to static values,
 // to make snapshot testing viable.  (If these helpers are more generally
@@ -141,7 +138,7 @@ describe('reporting', () => {
   });
 
   it(`queries three services`, async () => {
-    const query = gql`
+    const query = `#graphql
       query {
         me {
           name {
@@ -155,12 +152,15 @@ describe('reporting', () => {
       }
     `;
 
-    const result = await toPromise(
-      execute(createHttpLink({ uri: gatewayUrl, fetch: fetch as any }), {
-        query,
-      }),
-    );
-    expect(result).toMatchInlineSnapshot(`
+    const result = await fetch(gatewayUrl, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ query }),
+    });
+    const body = await result.json();
+    expect(body).toMatchInlineSnapshot(`
       Object {
         "data": Object {
           "me": Object {
@@ -231,6 +231,34 @@ describe('reporting', () => {
         "tracesPerQuery": Object {
           "# -
       {me{name{first last}}topProducts{name}}": Object {
+            "referencedFieldsByType": Object {
+              "Name": Object {
+                "fieldNames": Array [
+                  "first",
+                  "last",
+                ],
+                "isInterface": false,
+              },
+              "Product": Object {
+                "fieldNames": Array [
+                  "name",
+                ],
+                "isInterface": true,
+              },
+              "Query": Object {
+                "fieldNames": Array [
+                  "me",
+                  "topProducts",
+                ],
+                "isInterface": false,
+              },
+              "User": Object {
+                "fieldNames": Array [
+                  "name",
+                ],
+                "isInterface": false,
+              },
+            },
             "trace": Array [
               Object {
                 "cachePolicy": Object {
@@ -238,14 +266,13 @@ describe('reporting', () => {
                   "scope": "PRIVATE",
                 },
                 "clientName": "",
-                "clientReferenceId": "",
                 "clientVersion": "",
-                "details": Object {},
                 "durationNs": 12345,
                 "endTime": Object {
                   "nanos": 123000000,
                   "seconds": "1562203363",
                 },
+                "fieldExecutionWeight": 1,
                 "forbiddenOperation": false,
                 "fullQueryCacheHit": false,
                 "http": Object {

package/src/__tests__/gateway/supergraphSdl.test.ts

@@ -1,13 +1,14 @@
 import {
   ApolloGateway,
+  RemoteGraphQLDataSource,
   SubgraphHealthCheckFunction,
   SupergraphSdlUpdateFunction,
 } from '@apollo/gateway';
 import { fixturesWithUpdate } from 'apollo-federation-integration-testsuite';
-import { createHash } from 'apollo-graphql/lib/utilities/createHash';
+import { createHash } from '../../utilities/createHash';
 import { ApolloServer } from 'apollo-server';
 import { Logger } from 'apollo-server-types';
-import { fetch } from '../../__mocks__/apollo-server-env';
+import { fetch } from '../../__mocks__/make-fetch-happen-fetcher';
 import { getTestingSupergraphSdl } from '../execution-utils';
 import { mockAllServicesHealthCheckSuccess } from '../integration/nockMocks';
 import resolvable from '@josephg/resolvable';
@@ -17,6 +18,9 @@ async function getSupergraphSdlGatewayServer() {
   const server = new ApolloServer({
     gateway: new ApolloGateway({
       supergraphSdl: getTestingSupergraphSdl(),
+      buildService({ url }) {
+        return new RemoteGraphQLDataSource({ url, fetcher: fetch });
+      }
     }),
   });
 

package/src/__tests__/integration/nockMocks.ts

@@ -121,9 +121,10 @@ export function mockSupergraphSdlRequestSuccessIfAfter(
 }
 
 export function mockSupergraphSdlRequestIfAfterUnchanged(
-    ifAfter: string | null = null,
+  ifAfter: string | null = null,
+  url: string = mockCloudConfigUrl1,
 ) {
-  return mockSupergraphSdlRequestIfAfter(ifAfter).reply(
+  return mockSupergraphSdlRequestIfAfter(ifAfter, url).reply(
       200,
       JSON.stringify({
         data: {

package/src/datasources/LocalGraphQLDataSource.ts

@@ -39,7 +39,7 @@ export class LocalGraphQLDataSource<
       throw new Error(result.errors.map((error) => error.message).join('\n\n'));
     }
 
-    const sdl = result.data && result.data._service && result.data._service.sdl;
+    const sdl = result.data && result.data._service && (result.data._service as any).sdl;
     return parse(sdl);
   }
 }

package/src/datasources/RemoteGraphQLDataSource.ts

@@ -17,18 +17,24 @@ import { isObject } from '../utilities/predicates';
 import { GraphQLDataSource, GraphQLDataSourceProcessOptions, GraphQLDataSourceRequestKind } from './types';
 import createSHA from 'apollo-server-core/dist/utils/createSHA';
 import { parseCacheControlHeader } from './parseCacheControlHeader';
-
+import fetcher from 'make-fetch-happen';
 export class RemoteGraphQLDataSource<
   TContext extends Record<string, any> = Record<string, any>,
 > implements GraphQLDataSource<TContext>
 {
-  fetcher: typeof fetch = fetch;
+  fetcher: typeof fetch;
 
   constructor(
     config?: Partial<RemoteGraphQLDataSource<TContext>> &
       object &
       ThisType<RemoteGraphQLDataSource<TContext>>,
   ) {
+    this.fetcher = fetcher.defaults({
+      // although this is the default, we want to take extra care and be very
+      // explicity to ensure that mutations cannot be retried. please leave this
+      // intact.
+      retry: false,
+    });
     if (config) {
       return Object.assign(this, config);
     }

package/src/datasources/__tests__/LocalGraphQLDataSource.test.ts

@@ -1,7 +1,7 @@
 import { LocalGraphQLDataSource } from '../LocalGraphQLDataSource';
 import { buildSubgraphSchema } from '@apollo/subgraph';
 import gql from 'graphql-tag';
-import { GraphQLResolverMap } from 'apollo-graphql';
+import { GraphQLResolverMap } from '../../schema-helper';
 import { GraphQLRequestContext } from 'apollo-server-types';
 import { GraphQLDataSourceRequestKind } from '../types';
 

package/src/datasources/__tests__/RemoteGraphQLDataSource.test.ts

@@ -1,5 +1,5 @@
-import { fetch } from '../../__mocks__/apollo-server-env';
-import { makeFetchHappenFetcher } from '../../__mocks__/make-fetch-happen-fetcher';
+import { fetch as customFetcher } from '../../__mocks__/apollo-server-env';
+import { fetch } from '../../__mocks__/make-fetch-happen-fetcher';
 
 import {
   ApolloError,
@@ -263,8 +263,8 @@ describe('fetcher', () => {
     expect(data).toEqual({ injected: true });
   });
 
-  it('supports a custom fetcher, like `make-fetch-happen`', async () => {
-    const injectedFetch = makeFetchHappenFetcher.mockJSONResponseOnce({
+  it('supports a custom fetcher, like `node-fetch`', async () => {
+    const injectedFetch = customFetcher.mockJSONResponseOnce({
       data: { me: 'james' },
     });
     const DataSource = new RemoteGraphQLDataSource({

package/src/executeQueryPlan.ts

@@ -12,6 +12,8 @@ import {
   GraphQLFieldResolver,
   GraphQLFormattedError,
   isAbstractType,
+  isObjectType,
+  isInterfaceType,
   GraphQLSchema,
 } from 'graphql';
 import { Trace, google } from 'apollo-reporting-protobuf';
@@ -590,7 +592,7 @@ function doesTypeConditionMatch(
   }
 
   if (isAbstractType(conditionalType)) {
-    return schema.isSubType(conditionalType, type);
+    return (isObjectType(type) || isInterfaceType(type)) && schema.isSubType(conditionalType, type);
   }
 
   return false;

package/src/index.ts

@@ -400,7 +400,7 @@ export class ApolloGateway implements GraphQLService {
           apiKey: this.apolloConfig!.key!,
           uplinkEndpoints,
           maxRetries:
-            this.config.uplinkMaxRetries ?? uplinkEndpoints.length * 3,
+            this.config.uplinkMaxRetries ?? uplinkEndpoints.length * 3 - 1, // -1 for the initial request
           subgraphHealthCheck: this.config.serviceHealthCheck,
           fetcher: this.fetcher,
           logger: this.logger,
@@ -1144,3 +1144,6 @@ export {
   SupergraphSdlHook,
   SupergraphManager
 } from './config';
+
+export { UplinkFetcherError } from "./supergraphManagers"
+

package/src/schema-helper/addResolversToSchema.ts

@@ -0,0 +1,83 @@
+import {
+  GraphQLSchema,
+  isObjectType,
+  GraphQLEnumType,
+  isAbstractType,
+  isScalarType,
+  isEnumType,
+  GraphQLEnumValueConfig,
+} from 'graphql';
+
+import { GraphQLResolverMap } from './resolverMap';
+
+export function addResolversToSchema(
+  schema: GraphQLSchema,
+  resolvers: GraphQLResolverMap<any>
+) {
+  for (const [typeName, fieldConfigs] of Object.entries(resolvers)) {
+    const type = schema.getType(typeName);
+
+    if (isAbstractType(type)) {
+      for (const [fieldName, fieldConfig] of Object.entries(fieldConfigs)) {
+        if (fieldName.startsWith("__")) {
+          (type as any)[fieldName.substring(2)] = fieldConfig;
+        }
+      }
+    }
+
+    if (isScalarType(type)) {
+      for (const fn in fieldConfigs) {
+        (type as any)[fn] = (fieldConfigs as any)[fn];
+      }
+    }
+
+    if (isEnumType(type)) {
+      const values = type.getValues();
+      const newValues: { [key: string]: GraphQLEnumValueConfig } = {};
+      values.forEach(value => {
+        let newValue = (fieldConfigs as any)[value.name];
+        if (newValue === undefined) {
+          newValue = value.name;
+        }
+
+        newValues[value.name] = {
+          value: newValue,
+          deprecationReason: value.deprecationReason,
+          description: value.description,
+          astNode: value.astNode,
+          extensions: undefined
+        };
+      });
+
+      // In place updating hack to get around pulling in the full
+      // schema walking and immutable updating machinery from graphql-tools
+      Object.assign(
+        type,
+        new GraphQLEnumType({
+          ...type.toConfig(),
+          values: newValues
+        })
+      );
+    }
+
+    if (!isObjectType(type)) continue;
+
+    const fieldMap = type.getFields();
+
+    for (const [fieldName, fieldConfig] of Object.entries(fieldConfigs)) {
+      if (fieldName.startsWith("__")) {
+        (type as any)[fieldName.substring(2)] = fieldConfig;
+        continue;
+      }
+
+      const field = fieldMap[fieldName];
+      if (!field) continue;
+
+      if (typeof fieldConfig === "function") {
+        field.resolve = fieldConfig;
+      } else {
+        field.resolve = fieldConfig.resolve;
+      }
+    }
+  }
+}

package/src/schema-helper/error.ts

@@ -0,0 +1,11 @@
+import { GraphQLError } from "graphql";
+
+export class GraphQLSchemaValidationError extends Error {
+  constructor(public errors: ReadonlyArray<GraphQLError>) {
+    super();
+
+    this.name = this.constructor.name;
+    Error.captureStackTrace(this, this.constructor);
+    this.message = errors.map(error => error.message).join("\n\n");
+  }
+}

package/src/schema-helper/index.ts

@@ -0,0 +1,3 @@
+export * from './resolverMap';
+export * from './addResolversToSchema';
+export * from './error';