@apollo/gateway 0.50.0 → 0.51.0

package/dist/supergraphManagers/UplinkFetcher/loadSupergraphSdlFromStorage.d.ts

@@ -1,5 +1,5 @@
-import { fetch } from 'apollo-server-env';
 import { SupergraphSdlUpdate } from '../../config';
+import type { Fetcher } from '@apollo/utils.fetcher';
 export declare const SUPERGRAPH_SDL_QUERY = "#graphql\n  query SupergraphSdl($apiKey: String!, $ref: String!, $ifAfterId: ID) {\n    routerConfig(ref: $ref, apiKey: $apiKey, ifAfterId: $ifAfterId) {\n      __typename\n      ... on RouterConfigResult {\n        id\n        supergraphSdl: supergraphSDL\n        minDelaySeconds\n      }\n      ... on FetchError {\n        code\n        message\n      }\n    }\n  }\n";
 export declare class UplinkFetcherError extends Error {
     constructor(message: string);
@@ -9,7 +9,7 @@ export declare function loadSupergraphSdlFromUplinks({ graphRef, apiKey, endpoin
     apiKey: string;
     endpoints: string[];
     errorReportingEndpoint: string | undefined;
-    fetcher: typeof fetch;
+    fetcher: Fetcher;
     compositionId: string | null;
     maxRetries: number;
     roundRobinSeed: number;
@@ -20,7 +20,7 @@ export declare function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoin
     apiKey: string;
     endpoint: string;
     errorReportingEndpoint?: string;
-    fetcher: typeof fetch;
+    fetcher: Fetcher;
     compositionId: string | null;
 }): Promise<SupergraphSdlUpdate | null>;
 //# sourceMappingURL=loadSupergraphSdlFromStorage.d.ts.map

package/dist/supergraphManagers/UplinkFetcher/loadSupergraphSdlFromStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadSupergraphSdlFromStorage.d.ts","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkFetcher/loadSupergraphSdlFromStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,mBAAmB,CAAC;AAG7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAKnD,eAAO,MAAM,oBAAoB,wXAehC,CAAC;AAoBF,qBAAa,kBAAmB,SAAQ,KAAK;gBAC/B,OAAO,EAAE,MAAM;CAI5B;AAED,wBAAsB,4BAA4B,CAAC,EACjD,QAAQ,EACR,MAAM,EACN,SAAS,EACT,sBAAsB,EACtB,OAAO,EACP,aAAa,EACb,UAAU,EACV,cAAc,EACd,iBAAiB,GAClB,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,OAAO,EAAE,OAAO,KAAK,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,IAAI,GAAG,IAAI,CAAA;CAC/B,GAAI,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAuBvC;AAED,wBAAsB,4BAA4B,CAAC,EACjD,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,sBAAsB,EACtB,OAAO,EACP,aAAa,GACd,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,OAAO,EAAE,OAAO,KAAK,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,GAAI,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAyFvC"}
+{"version":3,"file":"loadSupergraphSdlFromStorage.d.ts","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkFetcher/loadSupergraphSdlFromStorage.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGnD,OAAO,KAAK,EACV,OAAO,EAGR,MAAM,uBAAuB,CAAC;AAG/B,eAAO,MAAM,oBAAoB,wXAehC,CAAC;AAoBF,qBAAa,kBAAmB,SAAQ,KAAK;gBAC/B,OAAO,EAAE,MAAM;CAI5B;AAED,wBAAsB,4BAA4B,CAAC,EACjD,QAAQ,EACR,MAAM,EACN,SAAS,EACT,sBAAsB,EACtB,OAAO,EACP,aAAa,EACb,UAAU,EACV,cAAc,EACd,iBAAiB,GAClB,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,IAAI,GAAG,IAAI,CAAA;CAC/B,GAAI,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAuBvC;AAED,wBAAsB,4BAA4B,CAAC,EACjD,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,sBAAsB,EACtB,OAAO,EACP,aAAa,GACd,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,GAAI,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CA2FvC"}

package/dist/supergraphManagers/UplinkFetcher/loadSupergraphSdlFromStorage.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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
@@ -52,17 +51,17 @@ async function loadSupergraphSdlFromUplinks({ graphRef, apiKey, endpoints, error
 exports.loadSupergraphSdlFromUplinks = loadSupergraphSdlFromUplinks;
 async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, errorReportingEndpoint, fetcher, compositionId, }) {
     var _a, _b;
-    let result;
+    const requestBody = JSON.stringify({
+        query: exports.SUPERGRAPH_SDL_QUERY,
+        variables: {
+            ref: graphRef,
+            apiKey,
+            ifAfterId: compositionId,
+        },
+    });
     const requestDetails = {
         method: 'POST',
-        body: JSON.stringify({
-            query: exports.SUPERGRAPH_SDL_QUERY,
-            variables: {
-                ref: graphRef,
-                apiKey,
-                ifAfterId: compositionId,
-            },
-        }),
+        body: requestBody,
         headers: {
             'apollographql-client-name': name,
             'apollographql-client-version': version,
@@ -70,8 +69,8 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, errorR
             'content-type': 'application/json',
         },
     };
-    const request = new apollo_server_env_1.Request(endpoint, requestDetails);
     const startTime = new Date();
+    let result;
     try {
         result = await fetcher(endpoint, requestDetails);
     }
@@ -79,7 +78,8 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, errorR
         const endTime = new Date();
         await (0, outOfBandReporter_1.submitOutOfBandReportIfConfigured)({
             error: e,
-            request,
+            requestEndpoint: endpoint,
+            requestBody,
             endpoint: errorReportingEndpoint,
             startedAt: startTime,
             endedAt: endTime,
@@ -103,7 +103,8 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, errorR
     else {
         await (0, outOfBandReporter_1.submitOutOfBandReportIfConfigured)({
             error: new UplinkFetcherError(fetchErrorMsg + result.status + ' ' + result.statusText),
-            request,
+            requestEndpoint: endpoint,
+            requestBody,
             endpoint: errorReportingEndpoint,
             response: result,
             startedAt: startTime,

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/UplinkFetcher/outOfBandReporter.d.ts

@@ -1,13 +1,14 @@
-import { fetch, Response, Request } from 'apollo-server-env';
+import { Fetcher, FetcherResponse } from '@apollo/utils.fetcher';
 export declare const OUT_OF_BAND_REPORTER_QUERY = "#graphql\n  mutation OOBReport($input: APIMonitoringReport) {\n    reportError(report: $input)\n  }\n";
-export declare function submitOutOfBandReportIfConfigured({ error, request, endpoint, response, startedAt, endedAt, tags, fetcher, }: {
+export declare function submitOutOfBandReportIfConfigured({ error, requestEndpoint, requestBody, endpoint, response, startedAt, endedAt, tags, fetcher, }: {
     error: Error;
-    request: Request;
+    requestEndpoint: string;
+    requestBody: string;
     endpoint: string | undefined;
-    response?: Response;
+    response?: FetcherResponse;
     startedAt: Date;
     endedAt: Date;
     tags?: string[];
-    fetcher: typeof fetch;
+    fetcher: Fetcher;
 }): Promise<void>;
 //# sourceMappingURL=outOfBandReporter.d.ts.map

package/dist/supergraphManagers/UplinkFetcher/outOfBandReporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outOfBandReporter.d.ts","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkFetcher/outOfBandReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAS7D,eAAO,MAAM,0BAA0B,0GAItC,CAAC;AAiBF,wBAAsB,iCAAiC,CAAC,EACtD,KAAK,EACL,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,OAAO,EACP,IAAI,EACJ,OAAO,GACR,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,IAAI,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,OAAO,KAAK,CAAC;CACvB,iBA6EA"}
+{"version":3,"file":"outOfBandReporter.d.ts","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkFetcher/outOfBandReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AASjE,eAAO,MAAM,0BAA0B,0GAItC,CAAC;AAiBF,wBAAsB,iCAAiC,CAAC,EACtD,KAAK,EACL,eAAe,EACf,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,OAAO,EACP,IAAI,EACJ,OAAO,GACR,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,IAAI,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB,iBA6EA"}

package/dist/supergraphManagers/UplinkFetcher/outOfBandReporter.js

@@ -8,7 +8,7 @@ exports.OUT_OF_BAND_REPORTER_QUERY = `#graphql
   }
 `;
 const { name, version } = require('../../../package.json');
-async function submitOutOfBandReportIfConfigured({ error, request, endpoint, response, startedAt, endedAt, tags, fetcher, }) {
+async function submitOutOfBandReportIfConfigured({ error, requestEndpoint, requestBody, endpoint, response, startedAt, endedAt, tags, fetcher, }) {
     var _a, _b;
     if (!endpoint) {
         return;
@@ -44,8 +44,8 @@ async function submitOutOfBandReportIfConfigured({ error, request, endpoint, res
                 message: error.message,
             },
             request: {
-                url: request.url,
-                body: await request.text(),
+                url: requestEndpoint,
+                body: requestBody,
             },
             response: response
                 ? {

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

@@ -1 +1 @@
-{"version":3,"file":"outOfBandReporter.js","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkFetcher/outOfBandReporter.ts"],"names":[],"mappings":";;;AAEA,mEAI0C;AAG7B,QAAA,0BAA0B,GAAgB;;;;CAItD,CAAC;AAEF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAepD,KAAK,UAAU,iCAAiC,CAAC,EACtD,KAAK,EACL,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,OAAO,EACP,IAAI,EACJ,OAAO,GAUR;;IAEC,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO;KACR;IAED,IAAI,SAAoB,CAAC;IACzB,IAAI,CAAC,QAAQ,EAAE;QACb,SAAS,GAAG,wBAAS,CAAC,gBAAgB,CAAC;KACxC;SAAM;QAEL,QAAQ,QAAQ,CAAC,MAAM,EAAE;YACvB,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,SAAS,GAAG,wBAAS,CAAC,WAAW,CAAC;gBAClC,MAAM;YACR,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,SAAS,GAAG,wBAAS,CAAC,OAAO,CAAC;gBAC9B,MAAM;YACR,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,SAAS,GAAG,wBAAS,CAAC,gBAAgB,CAAC;gBACvC,MAAM;YACR;gBACE,SAAS,GAAG,wBAAS,CAAC,KAAK,CAAC;SAC/B;KACF;IAED,MAAM,YAAY,GAAuB,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAE,CAAA,CAAC;IAEhE,MAAM,SAAS,GAA+B;QAC5C,KAAK,EAAE;YACL,KAAK,EAAE;gBACL,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB;YACD,OAAO,EAAE;gBACP,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,EAAE;aAC3B;YACD,QAAQ,EAAE,QAAQ;gBAChB,CAAC,CAAC;oBACE,cAAc,EAAE,QAAQ,CAAC,MAAM;oBAC/B,IAAI,EAAE,YAAY;iBACnB;gBACH,CAAC,CAAC,IAAI;YACR,SAAS,EAAE,SAAS,CAAC,WAAW,EAAE;YAClC,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE;YAC9B,IAAI,EAAE,IAAI;SACX;KACF,CAAC;IAEF,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE;YAC1C,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,KAAK,EAAE,kCAA0B;gBACjC,SAAS;aACV,CAAC;YACF,OAAO,EAAE;gBACP,2BAA2B,EAAE,IAAI;gBACjC,8BAA8B,EAAE,OAAO;gBACvC,YAAY,EAAE,GAAG,IAAI,IAAI,OAAO,EAAE;gBAClC,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAC,CAAC;QACH,MAAM,cAAc,GAA4B,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;QACzE,IAAI,CAAC,CAAA,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,0CAAE,WAAW,CAAA,EAAE;YACtC,MAAM,IAAI,KAAK,CACb,uCAAuC,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,UAAU,EAAE,CACtF,CAAC;SACH;KACF;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,uCAAuC,MAAA,CAAC,CAAC,OAAO,mCAAI,CAAC,EAAE,CAAC,CAAC;KAC1E;AACH,CAAC;AA/FD,8EA+FC"}
+{"version":3,"file":"outOfBandReporter.js","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkFetcher/outOfBandReporter.ts"],"names":[],"mappings":";;;AAEA,mEAI0C;AAG7B,QAAA,0BAA0B,GAAgB;;;;CAItD,CAAC;AAEF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAepD,KAAK,UAAU,iCAAiC,CAAC,EACtD,KAAK,EACL,eAAe,EACf,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,OAAO,EACP,IAAI,EACJ,OAAO,GAWR;;IAEC,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO;KACR;IAED,IAAI,SAAoB,CAAC;IACzB,IAAI,CAAC,QAAQ,EAAE;QACb,SAAS,GAAG,wBAAS,CAAC,gBAAgB,CAAC;KACxC;SAAM;QAEL,QAAQ,QAAQ,CAAC,MAAM,EAAE;YACvB,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,SAAS,GAAG,wBAAS,CAAC,WAAW,CAAC;gBAClC,MAAM;YACR,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,SAAS,GAAG,wBAAS,CAAC,OAAO,CAAC;gBAC9B,MAAM;YACR,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,SAAS,GAAG,wBAAS,CAAC,gBAAgB,CAAC;gBACvC,MAAM;YACR;gBACE,SAAS,GAAG,wBAAS,CAAC,KAAK,CAAC;SAC/B;KACF;IAED,MAAM,YAAY,GAAuB,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAE,CAAA,CAAC;IAEhE,MAAM,SAAS,GAA+B;QAC5C,KAAK,EAAE;YACL,KAAK,EAAE;gBACL,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB;YACD,OAAO,EAAE;gBACP,GAAG,EAAE,eAAe;gBACpB,IAAI,EAAE,WAAW;aAClB;YACD,QAAQ,EAAE,QAAQ;gBAChB,CAAC,CAAC;oBACE,cAAc,EAAE,QAAQ,CAAC,MAAM;oBAC/B,IAAI,EAAE,YAAY;iBACnB;gBACH,CAAC,CAAC,IAAI;YACR,SAAS,EAAE,SAAS,CAAC,WAAW,EAAE;YAClC,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE;YAC9B,IAAI,EAAE,IAAI;SACX;KACF,CAAC;IAEF,IAAI;QACF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE;YAC1C,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,KAAK,EAAE,kCAA0B;gBACjC,SAAS;aACV,CAAC;YACF,OAAO,EAAE;gBACP,2BAA2B,EAAE,IAAI;gBACjC,8BAA8B,EAAE,OAAO;gBACvC,YAAY,EAAE,GAAG,IAAI,IAAI,OAAO,EAAE;gBAClC,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAC,CAAC;QACH,MAAM,cAAc,GAA4B,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;QACzE,IAAI,CAAC,CAAA,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,0CAAE,WAAW,CAAA,EAAE;YACtC,MAAM,IAAI,KAAK,CACb,uCAAuC,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,UAAU,EAAE,CACtF,CAAC;SACH;KACF;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,uCAAuC,MAAA,CAAC,CAAC,OAAO,mCAAI,CAAC,EAAE,CAAC,CAAC;KAC1E;AACH,CAAC;AAjGD,8EAiGC"}

package/dist/typings/graphql.d.ts

@@ -0,0 +1,24 @@
+import { GraphQLResolveInfo } from 'graphql';
+declare type GraphQLReferenceResolver<TContext> = (reference: object, context: TContext, info: GraphQLResolveInfo) => any;
+interface ApolloSubgraphExtensions<TContext> {
+    resolveReference?: GraphQLReferenceResolver<TContext>;
+}
+declare module 'graphql/type/definition' {
+    interface GraphQLObjectTypeExtensions<_TSource = any, _TContext = any> {
+        apollo?: {
+            subgraph?: ApolloSubgraphExtensions<_TContext>;
+        };
+    }
+    interface GraphQLInterfaceTypeExtensions<_TSource = any, _TContext = any> {
+        apollo?: {
+            subgraph?: ApolloSubgraphExtensions<_TContext>;
+        };
+    }
+    interface GraphQLUnionTypeExtensions<_TSource = any, _TContext = any> {
+        apollo?: {
+            subgraph?: ApolloSubgraphExtensions<_TContext>;
+        };
+    }
+}
+export {};
+//# sourceMappingURL=graphql.d.ts.map

package/dist/typings/graphql.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/typings/graphql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE7C,aAAK,wBAAwB,CAAC,QAAQ,IAAI,CACxC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,kBAAkB,KACrB,GAAG,CAAC;AAET,UAAU,wBAAwB,CAAC,QAAQ;IACzC,gBAAgB,CAAC,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAC;CACvD;AAED,OAAO,QAAQ,yBAAyB,CAAC;IACvC,UAAU,2BAA2B,CAAC,QAAQ,GAAG,GAAG,EAAE,SAAS,GAAG,GAAG;QACnE,MAAM,CAAC,EAAE;YACP,QAAQ,CAAC,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAAC;SAChD,CAAA;KACF;IAED,UAAU,8BAA8B,CAAC,QAAQ,GAAG,GAAG,EAAE,SAAS,GAAG,GAAG;QACtE,MAAM,CAAC,EAAE;YACP,QAAQ,CAAC,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAAC;SAChD,CAAA;KACF;IAED,UAAU,0BAA0B,CAAC,QAAQ,GAAG,GAAG,EAAE,SAAS,GAAG,GAAG;QAClE,MAAM,CAAC,EAAE;YACP,QAAQ,CAAC,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAAC;SAChD,CAAA;KACF;CACF"}

package/dist/{schema-helper/resolverMap.js → typings/graphql.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=resolverMap.js.map
+//# sourceMappingURL=graphql.js.map

package/dist/typings/graphql.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphql.js","sourceRoot":"","sources":["../../src/typings/graphql.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/gateway",
-  "version": "0.50.0",
+  "version": "0.51.0",
   "description": "Apollo Gateway",
   "author": "Apollo <packages@apollographql.com>",
   "main": "dist/index.js",
@@ -26,26 +26,26 @@
   },
   "dependencies": {
     "@apollo/core-schema": "^0.2.0",
-    "@apollo/federation": "^0.36.0",
-    "@apollo/query-planner": "^0.10.0",
+    "@apollo/federation": "^0.36.2",
+    "@apollo/query-planner": "^0.10.2",
+    "@apollo/utils.createhash": "^1.0.0",
+    "@apollo/utils.fetcher": "^1.0.0",
+    "@apollo/utils.logger": "^1.0.0",
     "@josephg/resolvable": "^1.0.1",
     "@opentelemetry/api": "^1.0.1",
     "@types/node-fetch": "2.6.1",
     "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",
-    "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",
-    "apollo-utilities": "^1.3.0",
     "async-retry": "^1.3.3",
     "loglevel": "^1.6.1",
-    "make-fetch-happen": "^8.0.0",
-    "pretty-format": "^27.4.6",
-    "sha.js": "^2.4.11"
+    "make-fetch-happen": "^10.1.2",
+    "pretty-format": "^27.4.6"
   },
   "peerDependencies": {
     "graphql": "^15.8.0 || ^16.0.0"
   },
-  "gitHead": "60defe7f8eb227325462d1a90d0ab1a9f21f13ea"
+  "gitHead": "bf11c7dbd65049d1cb0d91b148f181b89e51e157"
 }

package/src/__tests__/executeQueryPlan.test.ts

@@ -20,7 +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';
+import { addResolversToSchema, GraphQLResolverMap } from '@apollo/subgraph/src/schema-helper';
 
 expect.addSnapshotSerializer(astSerializer);
 expect.addSnapshotSerializer(queryPlanSerializer);

package/src/__tests__/execution-utils.ts

@@ -1,9 +1,9 @@
 import {
-  GraphQLSchemaValidationError,
   GraphQLSchemaModule,
   GraphQLResolverMap,
-} from '../schema-helper';
-import { GraphQLRequest, GraphQLExecutionResult, Logger } from 'apollo-server-types';
+} from '@apollo/subgraph/src/schema-helper';
+import { GraphQLRequest, GraphQLExecutionResult } from 'apollo-server-types';
+import type { Logger } from '@apollo/utils.logger';
 import {
   composeAndValidate,
   ServiceDefinition,
@@ -14,9 +14,9 @@ import {
   executeQueryPlan,
   buildOperationContext,
 } from '@apollo/gateway';
-import { buildComposedSchema, QueryPlanner, QueryPlan } from '@apollo/query-planner';
+import { buildComposedSchema, QueryPlanner, QueryPlan, GraphQLSchemaValidationError } from '@apollo/query-planner';
 import { LocalGraphQLDataSource } from '../datasources/LocalGraphQLDataSource';
-import { mergeDeep } from 'apollo-utilities';
+import { mergeDeep } from '@apollo/client/utilities';
 
 import { queryPlanSerializer, astSerializer } from 'apollo-federation-integration-testsuite';
 import gql from 'graphql-tag';

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

@@ -1,19 +1,30 @@
-import { fetch } from '../../__mocks__/make-fetch-happen-fetcher';
+import nock from 'nock';
+
 import { ApolloServerBase as ApolloServer } from 'apollo-server-core';
 
 import { RemoteGraphQLDataSource } from '../../datasources/RemoteGraphQLDataSource';
 import { ApolloGateway, SERVICE_DEFINITION_QUERY } from '../../';
 import { fixtures } from 'apollo-federation-integration-testsuite';
 import { GraphQLDataSourceRequestKind } from '../../datasources/types';
+import { nockAfterEach, nockBeforeEach } from '../nockAssertions';
 
-beforeEach(() => {
-  fetch.mockReset();
-});
+beforeEach(nockBeforeEach);
+afterEach(nockAfterEach);
+
+const replyHeaders = {
+  'content-type': 'application/json',
+};
 
 it('calls buildService only once per service', async () => {
-  fetch.mockJSONResponseOnce({
-    data: { _service: { sdl: `extend type Query { thing: String }` } },
-  });
+  nock('https://api.example.com')
+    .post('/foo')
+    .reply(
+      200,
+      {
+        data: { _service: { sdl: `extend type Query { thing: String }` } },
+      },
+      replyHeaders,
+    );
 
   const buildServiceSpy = jest.fn(() => {
     return new RemoteGraphQLDataSource({
@@ -23,7 +34,7 @@ it('calls buildService only once per service', async () => {
 
   const gateway = new ApolloGateway({
     serviceList: [{ name: 'foo', url: 'https://api.example.com/foo' }],
-    buildService: buildServiceSpy
+    buildService: buildServiceSpy,
   });
 
   await gateway.load();
@@ -34,11 +45,13 @@ it('calls buildService only once per service', async () => {
 it('correctly passes the context from ApolloServer to datasources', async () => {
   const gateway = new ApolloGateway({
     localServiceList: fixtures,
-    buildService: _service => {
+    buildService: (_service) => {
       return new RemoteGraphQLDataSource({
         url: 'https://api.example.com/foo',
         willSendRequest: (options) => {
-          if (options.kind === GraphQLDataSourceRequestKind.INCOMING_OPERATION) {
+          if (
+            options.kind === GraphQLDataSourceRequestKind.INCOMING_OPERATION
+          ) {
             options.request.http?.headers.set(
               'x-user-id',
               options.context.userId,
@@ -67,7 +80,22 @@ it('correctly passes the context from ApolloServer to datasources', async () =>
     }
   `;
 
-  fetch.mockJSONResponseOnce({ data: { me: { username: '@jbaxleyiii' } } });
+  nock('https://api.example.com', {
+    reqheaders: {
+      'x-user-id': '1234',
+    },
+  })
+    .post('/foo', {
+      query: `{me{username}}`,
+      variables: {},
+    })
+    .reply(
+      200,
+      {
+        data: { me: { username: '@jbaxleyiii' } },
+      },
+      replyHeaders,
+    );
 
   const result = await server.executeOperation({
     query,
@@ -77,33 +105,32 @@ it('correctly passes the context from ApolloServer to datasources', async () =>
   expect(result.data).toEqual({
     me: { username: '@jbaxleyiii' },
   });
-
-  expect(fetch).toBeCalledTimes(1);
-  expect(fetch).toHaveFetched('https://api.example.com/foo', {
-    body: {
-      query: `{me{username}}`,
-      variables: {},
-    },
-    headers: {
-      'x-user-id': '1234',
-    },
-  });
 });
 
-function createSdlData(sdl: string): object {
-  return {
-    data: {
-      _service: {
-        sdl: sdl,
+function createSdlData(sdl: string): [number, any, Record<string, string>] {
+  return [
+    200,
+    {
+      data: {
+        _service: {
+          sdl: sdl,
+        },
       },
     },
-  };
+    replyHeaders,
+  ];
 }
 
 it('makes enhanced introspection request using datasource', async () => {
-  fetch.mockJSONResponseOnce(
-    createSdlData('extend type Query { one: String }'),
-  );
+  nock('https://api.example.com', {
+    reqheaders: {
+      'custom-header': 'some-custom-value',
+    },
+  })
+    .post('/override', {
+      query: SERVICE_DEFINITION_QUERY,
+    })
+    .reply(...createSdlData('extend type Query { one: String }'));
 
   const gateway = new ApolloGateway({
     serviceList: [
@@ -112,7 +139,7 @@ it('makes enhanced introspection request using datasource', async () => {
         url: 'https://api.example.com/one',
       },
     ],
-    buildService: _service => {
+    buildService: (_service) => {
       return new RemoteGraphQLDataSource({
         url: 'https://api.example.com/override',
         willSendRequest: ({ request }) => {
@@ -123,24 +150,20 @@ it('makes enhanced introspection request using datasource', async () => {
   });
 
   await gateway.load();
-
-  expect(fetch).toBeCalledTimes(1);
-
-  expect(fetch).toHaveFetched('https://api.example.com/override', {
-    body: {
-      query: SERVICE_DEFINITION_QUERY,
-    },
-    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 }'));
+  for (const subgraph of ['one', 'two', 'three']) {
+    nock('https://api.example.com', {
+      reqheaders: {
+        'service-name': subgraph,
+      },
+    })
+      .post(`/${subgraph}`, {
+        query: SERVICE_DEFINITION_QUERY,
+      })
+      .reply(...createSdlData(`extend type Query { ${subgraph}: String }`));
+  }
 
   const gateway = new ApolloGateway({
     serviceList: [
@@ -157,7 +180,7 @@ it('customizes request on a per-service basis', async () => {
         url: 'https://api.example.com/three',
       },
     ],
-    buildService: service => {
+    buildService: (service) => {
       return new RemoteGraphQLDataSource({
         url: service.url,
         willSendRequest: ({ request }) => {
@@ -168,35 +191,6 @@ it('customizes request on a per-service basis', async () => {
   });
 
   await gateway.load();
-
-  expect(fetch).toBeCalledTimes(3);
-
-  expect(fetch).toHaveFetched('https://api.example.com/one', {
-    body: {
-      query: `query __ApolloGetServiceDefinition__ { _service { sdl } }`,
-    },
-    headers: {
-      'service-name': 'one',
-    },
-  });
-
-  expect(fetch).toHaveFetched('https://api.example.com/two', {
-    body: {
-      query: `query __ApolloGetServiceDefinition__ { _service { sdl } }`,
-    },
-    headers: {
-      'service-name': 'two',
-    },
-  });
-
-  expect(fetch).toHaveFetched('https://api.example.com/three', {
-    body: {
-      query: `query __ApolloGetServiceDefinition__ { _service { sdl } }`,
-    },
-    headers: {
-      'service-name': 'three',
-    },
-  });
 });
 
 it('does not share service definition cache between gateways', async () => {
@@ -205,11 +199,17 @@ it('does not share service definition cache between gateways', async () => {
     updates += 1;
   };
 
+  function nockSDLFetchOnce() {
+    nock('https://api.example.com')
+      .post('/repeat', {
+        query: SERVICE_DEFINITION_QUERY,
+      })
+      .reply(...createSdlData('extend type Query { repeat: String }'));
+  }
+
   // Initialize first gateway
   {
-    fetch.mockJSONResponseOnce(
-      createSdlData('extend type Query { repeat: String }'),
-    );
+    nockSDLFetchOnce();
 
     const gateway = new ApolloGateway({
       serviceList: [
@@ -226,9 +226,7 @@ it('does not share service definition cache between gateways', async () => {
 
   // Initialize second gateway
   {
-    fetch.mockJSONResponseOnce(
-      createSdlData('extend type Query { repeat: String }'),
-    );
+    nockSDLFetchOnce();
 
     const gateway = new ApolloGateway({
       serviceList: [

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

@@ -4,7 +4,7 @@ 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';
+import { GraphQLSchemaModule } from '@apollo/subgraph/src/schema-helper';
 
 async function startFederatedServer(modules: GraphQLSchemaModule[]) {
   const schema = buildSubgraphSchema(modules);

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

@@ -1,19 +1,21 @@
-import { fetch } from '../../__mocks__/make-fetch-happen-fetcher';
+import nock from 'nock';
 import gql from 'graphql-tag';
 import { ApolloGateway } from '../../';
-import { fixtures } from 'apollo-federation-integration-testsuite';
-import { Logger } from 'apollo-server-types';
+import { accounts, fixtures } from 'apollo-federation-integration-testsuite';
+import type { Logger } from '@apollo/utils.logger';
+import { nockAfterEach, nockBeforeEach } from '../nockAssertions';
 
 let logger: {
-  warn: jest.MockedFunction<Logger['warn']>,
-  debug: jest.MockedFunction<Logger['debug']>,
-  error: jest.MockedFunction<Logger['error']>,
-  info: jest.MockedFunction<Logger['info']>,
-}
+  warn: jest.MockedFunction<Logger['warn']>;
+  debug: jest.MockedFunction<Logger['debug']>;
+  error: jest.MockedFunction<Logger['error']>;
+  info: jest.MockedFunction<Logger['info']>;
+};
 
-beforeEach(() => {
-  fetch.mockReset();
+beforeEach(nockBeforeEach);
+afterEach(nockAfterEach);
 
+beforeEach(() => {
   logger = {
     warn: jest.fn(),
     debug: jest.fn(),
@@ -38,7 +40,7 @@ describe('ApolloGateway executor', () => {
       }
     `;
 
-     // @ts-ignore
+    // @ts-ignore
     const { errors } = await executor({
       source,
       document: gql(source),
@@ -57,8 +59,10 @@ describe('ApolloGateway executor', () => {
   });
 
   it('should not crash if variables are not provided', async () => {
-    const me = { birthDate: '1988-10-21'};
-    fetch.mockJSONResponseOnce({ data: { me } });
+    const me = { birthDate: '1988-10-21' };
+
+    nock(accounts.url).post('/').reply(200, { data: { me } });
+
     const gateway = new ApolloGateway({
       localServiceList: fixtures,
     });
@@ -73,12 +77,11 @@ describe('ApolloGateway executor', () => {
       }
     `;
 
-     // @ts-ignore
+    // @ts-ignore
     const { errors, data } = await executor({
       source,
       document: gql(source),
-      request: {
-      },
+      request: {},
       queryHash: 'hashed',
       context: null,
       cache: {} as any,

package/src/__tests__/gateway/lifecycle-hooks.test.ts

@@ -16,7 +16,7 @@ import {
   fixtures,
   fixturesWithUpdate,
 } from 'apollo-federation-integration-testsuite';
-import { Logger } from 'apollo-server-types';
+import type { Logger } from '@apollo/utils.logger';
 import resolvable from '@josephg/resolvable';
 
 // The order of this was specified to preserve existing test coverage. Typically