@apollo/gateway 0.43.1 → 0.45.0-alpha.1

package/dist/loadSupergraphSdlFromStorage.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadSupergraphSdlFromStorage = exports.SUPERGRAPH_SDL_QUERY = void 0;
+exports.loadSupergraphSdlFromStorage = exports.loadSupergraphSdlFromUplinks = exports.SUPERGRAPH_SDL_QUERY = void 0;
 const apollo_server_env_1 = require("apollo-server-env");
 const outOfBandReporter_1 = require("./outOfBandReporter");
 exports.SUPERGRAPH_SDL_QUERY = `#graphql
-  query SupergraphSdl($apiKey: String!, $ref: String!) {
-    routerConfig(ref: $ref, apiKey: $apiKey) {
+  query SupergraphSdl($apiKey: String!, $ref: String!, $ifAfterId: ID) {
+    routerConfig(ref: $ref, apiKey: $apiKey, ifAfterId: $ifAfterId) {
       __typename
       ... on RouterConfigResult {
         id
@@ -20,7 +20,33 @@ exports.SUPERGRAPH_SDL_QUERY = `#graphql
 `;
 const { name, version } = require('../package.json');
 const fetchErrorMsg = "An error occurred while fetching your schema from Apollo: ";
-async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetcher, }) {
+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;
+    }
+    return result;
+}
+exports.loadSupergraphSdlFromUplinks = loadSupergraphSdlFromUplinks;
+async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, errorReportingEndpoint, fetcher, compositionId, }) {
     var _a, _b;
     let result;
     const requestDetails = {
@@ -30,6 +56,7 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetche
             variables: {
                 ref: graphRef,
                 apiKey,
+                ifAfterId: compositionId,
             },
         }),
         headers: {
@@ -40,19 +67,19 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetche
         },
     };
     const request = new apollo_server_env_1.Request(endpoint, requestDetails);
-    const OOBReport = new outOfBandReporter_1.OutOfBandReporter();
     const startTime = new Date();
     try {
         result = await fetcher(endpoint, requestDetails);
     }
     catch (e) {
         const endTime = new Date();
-        await OOBReport.submitOutOfBandReportIfConfigured({
+        await (0, outOfBandReporter_1.submitOutOfBandReportIfConfigured)({
             error: e,
             request,
+            endpoint: errorReportingEndpoint,
             startedAt: startTime,
             endedAt: endTime,
-            fetcher
+            fetcher,
         });
         throw new Error(fetchErrorMsg + ((_a = e.message) !== null && _a !== void 0 ? _a : e));
     }
@@ -70,13 +97,14 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetche
         }
     }
     else {
-        await OOBReport.submitOutOfBandReportIfConfigured({
+        await (0, outOfBandReporter_1.submitOutOfBandReportIfConfigured)({
             error: new Error(fetchErrorMsg + result.status + ' ' + result.statusText),
             request,
+            endpoint: errorReportingEndpoint,
             response: result,
             startedAt: startTime,
             endedAt: endTime,
-            fetcher
+            fetcher,
         });
         throw new Error(fetchErrorMsg + result.status + ' ' + result.statusText);
     }
@@ -89,6 +117,9 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetche
         const { code, message } = routerConfig;
         throw new Error(`${code}: ${message}`);
     }
+    else if (routerConfig.__typename === 'Unchanged') {
+        return null;
+    }
     else {
         throw new Error('Programming error: unhandled response failure');
     }

package/dist/loadSupergraphSdlFromStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadSupergraphSdlFromStorage.js","sourceRoot":"","sources":["../src/loadSupergraphSdlFromStorage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loadSupergraphSdlFromStorage.js","sourceRoot":"","sources":["../src/loadSupergraphSdlFromStorage.ts"],"names":[],"mappings":";;;AAAA,yDAA6D;AAG7D,2DAAwE;AAI3D,QAAA,oBAAoB,GAAgB;;;;;;;;;;;;;;CAchD,CAAC;AAgBF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAErD,MAAM,aAAa,GAAG,4DAA4D,CAAC;AAEnF,IAAI,YAAY,GAAG,CAAC,CAAC;AAEd,KAAK,UAAU,4BAA4B,CAAC,EACjD,QAAQ,EACR,MAAM,EACN,SAAS,EACT,sBAAsB,EACtB,OAAO,EACP,aAAa,EACb,UAAU,GASX;IACC,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,aAAa,GAAG,IAAI,CAAC;IACzB,IAAI,MAAM,GAA+B,IAAI,CAAC;IAC9C,OAAO,OAAO,EAAE,IAAI,UAAU,IAAI,MAAM,IAAI,IAAI,EAAE;QAChD,IAAI;YACF,MAAM,GAAG,MAAM,4BAA4B,CAAC;gBAC1C,QAAQ;gBACR,MAAM;gBACN,QAAQ,EAAE,SAAS,CAAC,YAAY,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC;gBACtD,sBAAsB;gBACtB,OAAO;gBACP,aAAa;aACd,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,aAAa,GAAG,CAAC,CAAC;SACnB;KACF;IACD,IAAI,MAAM,KAAK,IAAI,IAAI,aAAa,KAAK,IAAI,EAAE;QAC7C,MAAM,aAAa,CAAC;KACrB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAtCD,oEAsCC;AAEM,KAAK,UAAU,4BAA4B,CAAC,EACjD,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,sBAAsB,EACtB,OAAO,EACP,aAAa,GAQd;;IACC,IAAI,MAAgB,CAAC;IACrB,MAAM,cAAc,GAAG;QACrB,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,KAAK,EAAE,4BAAoB;YAC3B,SAAS,EAAE;gBACT,GAAG,EAAE,QAAQ;gBACb,MAAM;gBACN,SAAS,EAAE,aAAa;aACzB;SACF,CAAC;QACF,OAAO,EAAE;YACP,2BAA2B,EAAE,IAAI;YACjC,8BAA8B,EAAE,OAAO;YACvC,YAAY,EAAE,GAAG,IAAI,IAAI,OAAO,EAAE;YAClC,cAAc,EAAE,kBAAkB;SACnC;KACF,CAAC;IAEF,MAAM,OAAO,GAAY,IAAI,2BAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAE/D,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC7B,IAAI;QACF,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;KAClD;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;QAE3B,MAAM,IAAA,qDAAiC,EAAC;YACtC,KAAK,EAAE,CAAC;YACR,OAAO;YACP,QAAQ,EAAE,sBAAsB;YAChC,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE,OAAO;YAChB,OAAO;SACR,CAAC,CAAC;QAEH,MAAM,IAAI,KAAK,CAAC,aAAa,GAAG,CAAC,MAAA,CAAC,CAAC,OAAO,mCAAI,CAAC,CAAC,CAAC,CAAC;KACnD;IAED,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;IAC3B,IAAI,QAAkC,CAAC;IAEvC,IAAI,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,EAAE;QACtC,IAAI;YACF,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;SAChC;QAAC,OAAO,CAAC,EAAE;YAEV,MAAM,IAAI,KAAK,CAAC,MAAA,aAAa,GAAG,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,OAAO,mCAAI,CAAC,CAAC,CAAC;SACvE;QAED,IAAI,QAAQ,IAAI,QAAQ,EAAE;YACxB,MAAM,IAAI,KAAK,CACb,CAAC,aAAa,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CACpE,IAAI,CACL,CACF,CAAC;SACH;KACF;SAAM;QACL,MAAM,IAAA,qDAAiC,EAAC;YACtC,KAAK,EAAE,IAAI,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC;YACzE,OAAO;YACP,QAAQ,EAAE,sBAAsB;YAChC,QAAQ,EAAE,MAAM;YAChB,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE,OAAO;YAChB,OAAO;SACR,CAAC,CAAC;QACH,MAAM,IAAI,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;KAC1E;IAED,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC;IACvC,IAAI,YAAY,CAAC,UAAU,KAAK,oBAAoB,EAAE;QACpD,MAAM,EACJ,EAAE,EACF,aAAa,GAEd,GAAG,YAAY,CAAC;QACjB,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,aAAc,EAAE,CAAC;KAC9C;SAAM,IAAI,YAAY,CAAC,UAAU,KAAK,YAAY,EAAE;QAEnD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,KAAK,OAAO,EAAE,CAAC,CAAC;KACxC;SAAM,IAAI,YAAY,CAAC,UAAU,KAAK,WAAW,EAAE;QAClD,OAAO,IAAI,CAAC;KACb;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;KAClE;AACH,CAAC;AAtGD,oEAsGC"}

package/dist/outOfBandReporter.d.ts

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

package/dist/outOfBandReporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outOfBandReporter.d.ts","sourceRoot":"","sources":["../src/outOfBandReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAS7D,eAAO,MAAM,0BAA0B,0GAItC,CAAC;AAgBF,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAA4D;IAEpF,iCAAiC,CAAC,EACtC,KAAK,EACL,OAAO,EACP,QAAQ,EACR,SAAS,EACT,OAAO,EACP,IAAI,EACJ,OAAO,GACR,EAAE;QACD,KAAK,EAAE,KAAK,CAAC;QACb,OAAO,EAAE,OAAO,CAAC;QACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;QACpB,SAAS,EAAE,IAAI,CAAC;QAChB,OAAO,EAAE,IAAI,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAChB,OAAO,EAAE,OAAO,KAAK,CAAC;KACvB;CA+EF"}
+{"version":3,"file":"outOfBandReporter.d.ts","sourceRoot":"","sources":["../src/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"}

package/dist/outOfBandReporter.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OutOfBandReporter = exports.OUT_OF_BAND_REPORTER_QUERY = void 0;
+exports.submitOutOfBandReportIfConfigured = exports.OUT_OF_BAND_REPORTER_QUERY = void 0;
 const graphqlTypes_1 = require("./__generated__/graphqlTypes");
 exports.OUT_OF_BAND_REPORTER_QUERY = `#graphql
   mutation OOBReport($input: APIMonitoringReport) {
@@ -8,81 +8,78 @@ exports.OUT_OF_BAND_REPORTER_QUERY = `#graphql
   }
 `;
 const { name, version } = require('../package.json');
-class OutOfBandReporter {
-    async submitOutOfBandReportIfConfigured({ error, request, response, startedAt, endedAt, tags, fetcher, }) {
-        var _a, _b;
-        if (!OutOfBandReporter.endpoint) {
-            return;
-        }
-        let errorCode;
-        if (!response) {
-            errorCode = graphqlTypes_1.ErrorCode.ConnectionFailed;
-        }
-        else {
-            switch (response.status) {
-                case 400:
-                case 413:
-                case 422:
-                    errorCode = graphqlTypes_1.ErrorCode.InvalidBody;
-                    break;
-                case 408:
-                case 504:
-                    errorCode = graphqlTypes_1.ErrorCode.Timeout;
-                    break;
-                case 502:
-                case 503:
-                    errorCode = graphqlTypes_1.ErrorCode.ConnectionFailed;
-                    break;
-                default:
-                    errorCode = graphqlTypes_1.ErrorCode.Other;
-            }
+async function submitOutOfBandReportIfConfigured({ error, request, endpoint, response, startedAt, endedAt, tags, fetcher, }) {
+    var _a, _b;
+    if (!endpoint) {
+        return;
+    }
+    let errorCode;
+    if (!response) {
+        errorCode = graphqlTypes_1.ErrorCode.ConnectionFailed;
+    }
+    else {
+        switch (response.status) {
+            case 400:
+            case 413:
+            case 422:
+                errorCode = graphqlTypes_1.ErrorCode.InvalidBody;
+                break;
+            case 408:
+            case 504:
+                errorCode = graphqlTypes_1.ErrorCode.Timeout;
+                break;
+            case 502:
+            case 503:
+                errorCode = graphqlTypes_1.ErrorCode.ConnectionFailed;
+                break;
+            default:
+                errorCode = graphqlTypes_1.ErrorCode.Other;
         }
-        const responseBody = await (response === null || response === void 0 ? void 0 : response.text());
-        const variables = {
-            input: {
-                error: {
-                    code: errorCode,
-                    message: error.message,
-                },
-                request: {
-                    url: request.url,
-                    body: await request.text(),
-                },
-                response: response
-                    ? {
-                        httpStatusCode: response.status,
-                        body: responseBody,
-                    }
-                    : null,
-                startedAt: startedAt.toISOString(),
-                endedAt: endedAt.toISOString(),
-                tags: tags,
+    }
+    const responseBody = await (response === null || response === void 0 ? void 0 : response.text());
+    const variables = {
+        input: {
+            error: {
+                code: errorCode,
+                message: error.message,
             },
-        };
-        try {
-            const oobResponse = await fetcher(OutOfBandReporter.endpoint, {
-                method: 'POST',
-                body: JSON.stringify({
-                    query: exports.OUT_OF_BAND_REPORTER_QUERY,
-                    variables,
-                }),
-                headers: {
-                    'apollographql-client-name': name,
-                    'apollographql-client-version': version,
-                    'user-agent': `${name}/${version}`,
-                    'content-type': 'application/json',
-                },
-            });
-            const parsedResponse = await oobResponse.json();
-            if (!((_a = parsedResponse === null || parsedResponse === void 0 ? void 0 : parsedResponse.data) === null || _a === void 0 ? void 0 : _a.reportError)) {
-                throw new Error(`Out-of-band error reporting failed: ${oobResponse.status} ${oobResponse.statusText}`);
-            }
-        }
-        catch (e) {
-            throw new Error(`Out-of-band error reporting failed: ${(_b = e.message) !== null && _b !== void 0 ? _b : e}`);
+            request: {
+                url: request.url,
+                body: await request.text(),
+            },
+            response: response
+                ? {
+                    httpStatusCode: response.status,
+                    body: responseBody,
+                }
+                : null,
+            startedAt: startedAt.toISOString(),
+            endedAt: endedAt.toISOString(),
+            tags: tags,
+        },
+    };
+    try {
+        const oobResponse = await fetcher(endpoint, {
+            method: 'POST',
+            body: JSON.stringify({
+                query: exports.OUT_OF_BAND_REPORTER_QUERY,
+                variables,
+            }),
+            headers: {
+                'apollographql-client-name': name,
+                'apollographql-client-version': version,
+                'user-agent': `${name}/${version}`,
+                'content-type': 'application/json',
+            },
+        });
+        const parsedResponse = await oobResponse.json();
+        if (!((_a = parsedResponse === null || parsedResponse === void 0 ? void 0 : parsedResponse.data) === null || _a === void 0 ? void 0 : _a.reportError)) {
+            throw new Error(`Out-of-band error reporting failed: ${oobResponse.status} ${oobResponse.statusText}`);
         }
     }
+    catch (e) {
+        throw new Error(`Out-of-band error reporting failed: ${(_b = e.message) !== null && _b !== void 0 ? _b : e}`);
+    }
 }
-exports.OutOfBandReporter = OutOfBandReporter;
-OutOfBandReporter.endpoint = process.env.APOLLO_OUT_OF_BAND_REPORTER_ENDPOINT || null;
+exports.submitOutOfBandReportIfConfigured = submitOutOfBandReportIfConfigured;
 //# sourceMappingURL=outOfBandReporter.js.map

package/dist/outOfBandReporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"outOfBandReporter.js","sourceRoot":"","sources":["../src/outOfBandReporter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"outOfBandReporter.js","sourceRoot":"","sources":["../src/outOfBandReporter.ts"],"names":[],"mappings":";;;AAEA,+DAIsC;AAGzB,QAAA,0BAA0B,GAAgB;;;;CAItD,CAAC;AAEF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAe9C,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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/gateway",
-  "version": "0.43.1",
+  "version": "0.45.0-alpha.1",
   "description": "Apollo Gateway",
   "author": "Apollo <packages@apollographql.com>",
   "main": "dist/index.js",
@@ -25,24 +25,24 @@
     "access": "public"
   },
   "dependencies": {
-    "@apollo/core-schema": "^0.1.0",
-    "@apollo/federation": "^0.33.6",
-    "@apollo/query-planner": "^0.6.0",
+    "@apollo/core-schema": "^0.2.0",
+    "@apollo/federation": "^0.33.8",
+    "@apollo/query-planner": "^0.6.2-alpha.0",
     "@opentelemetry/api": "^1.0.1",
     "@types/node-fetch": "2.5.12",
-    "apollo-graphql": "^0.9.3",
-    "apollo-reporting-protobuf": "^0.8.0 || ^3.0.0",
+    "apollo-graphql": "^0.9.5",
+    "apollo-reporting-protobuf": "^0.8.0 || ^3.0.0 || ^3.3.0-alpha.0",
     "apollo-server-caching": "^0.7.0 || ^3.0.0",
-    "apollo-server-core": "^2.23.0 || ^3.0.0",
+    "apollo-server-core": "^2.23.0 || ^3.0.0 || ^3.6.0-alpha.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-server-types": "^0.9.0 || ^3.0.0 || ^3.5.0-alpha.0",
     "loglevel": "^1.6.1",
     "make-fetch-happen": "^8.0.0",
-    "pretty-format": "^26.0.0"
+    "pretty-format": "^27.3.1"
   },
   "peerDependencies": {
-    "graphql": "^15.5.3"
+    "graphql": "^15.7.2"
   },
-  "gitHead": "c6112749b4a3d840713da9a597a8f47ef3b336f8"
+  "gitHead": "e6cc90bd8a12e62a5a982178fee7622089739f45"
 }

package/src/__generated__/graphqlTypes.ts

@@ -1,4 +1,5 @@
 export type Maybe<T> = T | null;
+export type InputMaybe<T> = Maybe<T>;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
 export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
 export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
@@ -17,15 +18,15 @@ export type ApiMonitoringReport = {
   endedAt: Scalars['Timestamp'];
   error: Error;
   request: Request;
-  response?: Maybe<Response>;
+  response?: InputMaybe<Response>;
   startedAt: Scalars['Timestamp'];
   /** Tags can include things like version and package name */
-  tags?: Maybe<Array<Scalars['String']>>;
+  tags?: InputMaybe<Array<Scalars['String']>>;
 };
 
 export type Error = {
   code: ErrorCode;
-  message?: Maybe<Scalars['String']>;
+  message?: InputMaybe<Scalars['String']>;
 };
 
 export enum ErrorCode {
@@ -55,7 +56,7 @@ export enum FetchErrorCode {
 
 export type HttpHeader = {
   name: Scalars['String'];
-  value?: Maybe<Scalars['String']>;
+  value?: InputMaybe<Scalars['String']>;
 };
 
 export type Message = {
@@ -77,7 +78,7 @@ export type Mutation = {
 
 
 export type MutationReportErrorArgs = {
-  report?: Maybe<ApiMonitoringReport>;
+  report?: InputMaybe<ApiMonitoringReport>;
 };
 
 export type Query = {
@@ -90,19 +91,19 @@ export type Query = {
 
 export type QueryRouterConfigArgs = {
   apiKey: Scalars['String'];
+  ifAfterId?: InputMaybe<Scalars['ID']>;
   ref: Scalars['String'];
-  unlessIdIn?: Maybe<Array<Scalars['ID']>>;
 };
 
 export type Request = {
-  body?: Maybe<Scalars['String']>;
-  headers?: Maybe<Array<HttpHeader>>;
+  body?: InputMaybe<Scalars['String']>;
+  headers?: InputMaybe<Array<HttpHeader>>;
   url: Scalars['String'];
 };
 
 export type Response = {
-  body?: Maybe<Scalars['String']>;
-  headers?: Maybe<Array<HttpHeader>>;
+  body?: InputMaybe<Scalars['String']>;
+  headers?: InputMaybe<Array<HttpHeader>>;
   httpStatusCode: Scalars['Int'];
 };
 
@@ -125,13 +126,14 @@ export type Unchanged = {
 export type SupergraphSdlQueryVariables = Exact<{
   apiKey: Scalars['String'];
   ref: Scalars['String'];
+  ifAfterId?: InputMaybe<Scalars['ID']>;
 }>;
 
 
 export type SupergraphSdlQuery = { __typename?: 'Query', routerConfig: { __typename: 'FetchError', code: FetchErrorCode, message: string } | { __typename: 'RouterConfigResult', id: string, supergraphSdl: string } | { __typename: 'Unchanged' } };
 
 export type OobReportMutationVariables = Exact<{
-  input?: Maybe<ApiMonitoringReport>;
+  input?: InputMaybe<ApiMonitoringReport>;
 }>;
 
 

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

@@ -12,6 +12,7 @@ import { ApolloGateway } from '../..';
 import { Plugin, Config, Refs } from 'pretty-format';
 import { Report, Trace } from 'apollo-reporting-protobuf';
 import { fixtures } from 'apollo-federation-integration-testsuite';
+import { nockAfterEach, nockBeforeEach } from '../nockAssertions';
 
 // Normalize specific fields that change often (eg timestamps) to static values,
 // to make snapshot testing viable.  (If these helpers are more generally
@@ -89,7 +90,6 @@ describe('reporting', () => {
   let gatewayServer: ApolloServer;
   let gatewayUrl: string;
   let reportPromise: Promise<any>;
-  let nockScope: nock.Scope;
 
   beforeEach(async () => {
     let reportResolver: (report: any) => void;
@@ -97,7 +97,8 @@ describe('reporting', () => {
       reportResolver = resolve;
     });
 
-    nockScope = nock('https://usage-reporting.api.apollographql.com')
+    nockBeforeEach();
+    nock('https://usage-reporting.api.apollographql.com')
       .post('/api/ingress/traces')
       .reply(200, (_: any, requestBody: string) => {
         reportResolver(requestBody);
@@ -137,7 +138,8 @@ describe('reporting', () => {
     if (gatewayServer) {
       await gatewayServer.stop();
     }
-    nockScope.done();
+
+    nockAfterEach();
   });
 
   it(`queries three services`, async () => {

package/src/__tests__/integration/configuration.test.ts

@@ -7,7 +7,9 @@ import {
   mockSdlQuerySuccess,
   mockSupergraphSdlRequestSuccess,
   mockApolloConfig,
-  mockCloudConfigUrl,
+  mockCloudConfigUrl1,
+  mockCloudConfigUrl2,
+  mockCloudConfigUrl3,
 } from './nockMocks';
 import { getTestingSupergraphSdl } from '../execution-utils';
 import { MockService } from './networkRequests.test';
@@ -110,8 +112,26 @@ describe('gateway configuration warnings', () => {
 
     gateway = new ApolloGateway({
       logger,
-      // TODO(trevor:cloudconfig): remove
-      schemaConfigDeliveryEndpoint: mockCloudConfigUrl,
+      uplinkEndpoints: [mockCloudConfigUrl1],
+    });
+
+    await gateway.load(mockApolloConfig);
+
+    await gateway.stop();
+
+    expect(logger.warn).not.toHaveBeenCalledWith(
+      expect.stringMatching(
+        /A local gateway configuration is overriding a managed federation configuration/,
+      ),
+    );
+  });
+
+  it('deprecated conflicting configurations are not warned about when absent', async () => {
+    mockSupergraphSdlRequestSuccess();
+
+    gateway = new ApolloGateway({
+      logger,
+      schemaConfigDeliveryEndpoint: mockCloudConfigUrl1,
     });
 
     await gateway.load(mockApolloConfig);
@@ -300,7 +320,6 @@ describe('gateway config / env behavior', () => {
     });
   });
 
-  // TODO(trevor:cloudconfig): this behavior will be updated
   describe('schema config delivery endpoint configuration', () => {
     it('A code config overrides the env variable', async () => {
       cleanUp = mockedEnv({
@@ -309,28 +328,30 @@ describe('gateway config / env behavior', () => {
 
       gateway = new ApolloGateway({
         logger,
-        schemaConfigDeliveryEndpoint: 'code-config',
+        uplinkEndpoints: [mockCloudConfigUrl1, mockCloudConfigUrl2, mockCloudConfigUrl3],
       });
 
-      expect(gateway['schemaConfigDeliveryEndpoint']).toEqual(
-        'code-config',
+      expect(gateway['uplinkEndpoints']).toEqual(
+        [mockCloudConfigUrl1, mockCloudConfigUrl2, mockCloudConfigUrl3],
       );
 
       gateway = null;
     });
+  });
 
-    it('A code config set to `null` takes precedence over an existing env variable', async () => {
+  describe('deprecated schema config delivery endpoint configuration', () => {
+    it('A code config overrides the env variable', async () => {
       cleanUp = mockedEnv({
         APOLLO_SCHEMA_CONFIG_DELIVERY_ENDPOINT: 'env-config',
       });
 
       gateway = new ApolloGateway({
         logger,
-        schemaConfigDeliveryEndpoint: null,
+        schemaConfigDeliveryEndpoint: 'code-config',
       });
 
-      expect(gateway['schemaConfigDeliveryEndpoint']).toEqual(
-        null,
+      expect(gateway['uplinkEndpoints']).toEqual(
+        ['code-config'],
       );
 
       gateway = null;