@apollo/gateway 2.1.0-alpha.3 → 2.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/datasources/RemoteGraphQLDataSource.d.ts.map +1 -1
- package/dist/datasources/RemoteGraphQLDataSource.js +3 -1
- package/dist/datasources/RemoteGraphQLDataSource.js.map +1 -1
- package/dist/schema-helper/addExtensions.d.ts.map +1 -1
- package/dist/schema-helper/addExtensions.js +6 -3
- package/dist/schema-helper/addExtensions.js.map +1 -1
- package/dist/supergraphManagers/UplinkSupergraphManager/index.d.ts +2 -2
- package/dist/supergraphManagers/UplinkSupergraphManager/index.d.ts.map +1 -1
- package/dist/supergraphManagers/UplinkSupergraphManager/index.js.map +1 -1
- package/dist/supergraphManagers/UplinkSupergraphManager/loadSupergraphSdlFromStorage.d.ts +1 -1
- package/dist/supergraphManagers/UplinkSupergraphManager/loadSupergraphSdlFromStorage.d.ts.map +1 -1
- package/dist/supergraphManagers/UplinkSupergraphManager/outOfBandReporter.d.ts +1 -2
- package/dist/supergraphManagers/UplinkSupergraphManager/outOfBandReporter.d.ts.map +1 -1
- package/dist/supergraphManagers/UplinkSupergraphManager/outOfBandReporter.js.map +1 -1
- package/package.json +9 -9
- package/src/__tests__/executeQueryPlan.test.ts +134 -0
- package/src/__tests__/integration/managed.test.ts +3 -2
- package/src/datasources/RemoteGraphQLDataSource.ts +3 -1
- package/src/schema-helper/__tests__/addExtensions.test.ts +54 -0
- package/src/schema-helper/addExtensions.ts +8 -2
- package/src/supergraphManagers/UplinkSupergraphManager/__tests__/loadSupergraphSdlFromStorage.test.ts +46 -2
- package/src/supergraphManagers/UplinkSupergraphManager/index.ts +3 -3
- package/src/supergraphManagers/UplinkSupergraphManager/loadSupergraphSdlFromStorage.ts +5 -5
- package/src/supergraphManagers/UplinkSupergraphManager/outOfBandReporter.ts +1 -2
- package/dist/supergraphManagers/UplinkSupergraphManager/types.d.ts +0 -9
- package/dist/supergraphManagers/UplinkSupergraphManager/types.d.ts.map +0 -1
- package/dist/supergraphManagers/UplinkSupergraphManager/types.js +0 -5
- package/dist/supergraphManagers/UplinkSupergraphManager/types.js.map +0 -1
- package/src/supergraphManagers/UplinkSupergraphManager/types.ts +0 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteGraphQLDataSource.d.ts","sourceRoot":"","sources":["../../src/datasources/RemoteGraphQLDataSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,+BAA+B,EAAgC,MAAM,SAAS,CAAC;AAI3G,OAAO,EAA+B,OAAO,IAAI,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACtF,OAAO,EAAE,OAAO,EAAsB,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,YAAY,EAA0B,MAAM,SAAS,CAAC;AAC/D,OAAO,EAA+D,4BAA4B,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAErK,qBAAa,uBAAuB,CAClC,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAC1D,YAAW,iBAAiB,CAAC,QAAQ,CAAC;IAEtC,OAAO,EAAE,OAAO,CAAC;gBAGf,MAAM,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,GACjD,MAAM,GACN,QAAQ,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAkB/C,GAAG,EAAG,MAAM,CAAC;IAoBb,GAAG,EAAE,OAAO,CAAS;IAMrB,+BAA+B,EAAE,OAAO,CAAQ;IAE1C,OAAO,CACX,OAAO,EAAE,+BAA+B,CAAC,QAAQ,CAAC,GACjD,OAAO,CAAC,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"RemoteGraphQLDataSource.d.ts","sourceRoot":"","sources":["../../src/datasources/RemoteGraphQLDataSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,+BAA+B,EAAgC,MAAM,SAAS,CAAC;AAI3G,OAAO,EAA+B,OAAO,IAAI,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACtF,OAAO,EAAE,OAAO,EAAsB,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,YAAY,EAA0B,MAAM,SAAS,CAAC;AAC/D,OAAO,EAA+D,4BAA4B,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAErK,qBAAa,uBAAuB,CAClC,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAC1D,YAAW,iBAAiB,CAAC,QAAQ,CAAC;IAEtC,OAAO,EAAE,OAAO,CAAC;gBAGf,MAAM,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC,GACjD,MAAM,GACN,QAAQ,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAkB/C,GAAG,EAAG,MAAM,CAAC;IAoBb,GAAG,EAAE,OAAO,CAAS;IAMrB,+BAA+B,EAAE,OAAO,CAAQ;IAE1C,OAAO,CACX,OAAO,EAAE,+BAA+B,CAAC,QAAQ,CAAC,GACjD,OAAO,CAAC,sBAAsB,CAAC;YAkGpB,WAAW;IAsDlB,eAAe,CAAC,CACrB,OAAO,EAAE,+BAA+B,CAAC,QAAQ,CAAC,GACjD,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAET,OAAO;IA0Cd,kBAAkB,CAAC,CACxB,cAAc,EAAE,QAAQ,CACtB,IAAI,CAAC,4BAA4B,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,SAAS,CAAC,CACjF,GACA,sBAAsB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAEpD,iBAAiB,CACtB,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,gBAAgB,EAC/B,cAAc,CAAC,EAAE,eAAe,EAChC,QAAQ,CAAC,EAAE,QAAQ;IAKd,SAAS,CACd,aAAa,EAAE,eAAe,EAC9B,aAAa,CAAC,EAAE,gBAAgB,EAChC,QAAQ,CAAC,EAAE,QAAQ,GAClB,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;IASd,iBAAiB,CAAC,QAAQ,EAAE,eAAe;CAsBzD"}
|
|
@@ -47,7 +47,9 @@ class RemoteGraphQLDataSource {
|
|
|
47
47
|
}
|
|
48
48
|
const { query, ...requestWithoutQuery } = request;
|
|
49
49
|
const overallCachePolicy = this.honorSubgraphCacheControlHeader &&
|
|
50
|
-
options.kind === types_1.GraphQLDataSourceRequestKind.INCOMING_OPERATION
|
|
50
|
+
options.kind === types_1.GraphQLDataSourceRequestKind.INCOMING_OPERATION &&
|
|
51
|
+
options.incomingRequestContext.overallCachePolicy &&
|
|
52
|
+
'restrict' in options.incomingRequestContext.overallCachePolicy
|
|
51
53
|
? options.incomingRequestContext.overallCachePolicy
|
|
52
54
|
: null;
|
|
53
55
|
if (this.apq) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteGraphQLDataSource.js","sourceRoot":"","sources":["../../src/datasources/RemoteGraphQLDataSource.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAmD;AACnD,mCAA2G;AAC3G,+DAAsD;AACtD,uEAAoE;AACpE,0EAAwC;AACxC,2CAAsF;AAEtF,qCAA+D;AAG/D,MAAa,uBAAuB;IAMlC,YACE,MAE6C;QAsC/C,QAAG,GAAY,KAAK,CAAC;QAMrB,oCAA+B,GAAY,IAAI,CAAC;QA1C9C,IAAI,CAAC,OAAO,GAAG,2BAAO,CAAC,QAAQ,CAAC;YAK9B,UAAU,EAAE,QAAQ;YAIpB,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;QACH,IAAI,MAAM,EAAE;YACV,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACpC;IACH,CAAC;IA8BD,KAAK,CAAC,OAAO,CACX,OAAkD;;QAElD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;QAQtD,MAAM,OAAO,GAAG,eAA2B,CAAC;QAG5C,MAAM,OAAO,GAAG,IAAI,oBAAgB,EAAE,CAAC;QACvC,IAAI,MAAA,OAAO,CAAC,IAAI,0CAAE,OAAO,EAAE;YACzB,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE;gBAChD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aAC7B;SACF;QACD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAEhD,OAAO,CAAC,IAAI,GAAG;YACb,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,OAAO;SACR,CAAC;QAEF,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;SACrC;QAED,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;SAClC;QAED,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,EAAE,GAAG,OAAO,CAAC;QAKlD,MAAM,kBAAkB,GACtB,IAAI,CAAC,+BAA+B;YACpC,OAAO,CAAC,IAAI,KAAK,oCAA4B,CAAC,kBAAkB;
|
|
1
|
+
{"version":3,"file":"RemoteGraphQLDataSource.js","sourceRoot":"","sources":["../../src/datasources/RemoteGraphQLDataSource.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addExtensions.d.ts","sourceRoot":"","sources":["../../src/schema-helper/addExtensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"addExtensions.d.ts","sourceRoot":"","sources":["../../src/schema-helper/addExtensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAKxC,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,aAAa,CAiBlE"}
|
|
@@ -3,13 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addExtensions = void 0;
|
|
4
4
|
const { version } = require('../../package.json');
|
|
5
5
|
function addExtensions(schema) {
|
|
6
|
-
var _a;
|
|
6
|
+
var _a, _b, _c;
|
|
7
|
+
const schemaExtension = (_a = schema.extensions) !== null && _a !== void 0 ? _a : {};
|
|
8
|
+
const apolloExtension = (_b = schemaExtension === null || schemaExtension === void 0 ? void 0 : schemaExtension.apollo) !== null && _b !== void 0 ? _b : {};
|
|
9
|
+
const gatewayExtension = (_c = apolloExtension === null || apolloExtension === void 0 ? void 0 : apolloExtension.gateway) !== null && _c !== void 0 ? _c : {};
|
|
7
10
|
schema.extensions = {
|
|
8
11
|
...schema.extensions,
|
|
9
12
|
apollo: {
|
|
10
|
-
...
|
|
13
|
+
...apolloExtension,
|
|
11
14
|
gateway: {
|
|
12
|
-
...
|
|
15
|
+
...gatewayExtension,
|
|
13
16
|
version,
|
|
14
17
|
}
|
|
15
18
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addExtensions.js","sourceRoot":"","sources":["../../src/schema-helper/addExtensions.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"addExtensions.js","sourceRoot":"","sources":["../../src/schema-helper/addExtensions.ts"],"names":[],"mappings":";;;AAGA,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAElD,SAAgB,aAAa,CAAC,MAAqB;;IACjD,MAAM,eAAe,GAAG,MAAA,MAAM,CAAC,UAAqC,mCAAI,EAAE,CAAC;IAC3E,MAAM,eAAe,GAAG,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,mCAAI,EAAE,CAAC;IACtD,MAAM,gBAAgB,GAAG,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,OAAO,mCAAI,EAAE,CAAC;IAExD,MAAM,CAAC,UAAU,GAAG;QAClB,GAAG,MAAM,CAAC,UAAU;QACpB,MAAM,EAAE;YACN,GAAG,eAAe;YAClB,OAAO,EAAE;gBACP,GAAG,gBAAgB;gBACnB,OAAO;aACR;SACF;KACF,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAjBD,sCAiBC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Logger } from '@apollo/utils.logger';
|
|
2
|
+
import type { Fetcher } from '@apollo/utils.fetcher';
|
|
2
3
|
import { SupergraphManager, SupergraphSdlHookOptions } from '../../config';
|
|
3
|
-
import type { AbortableFetcher } from './types';
|
|
4
4
|
export declare type FailureToFetchSupergraphSdlFunctionParams = {
|
|
5
5
|
error: Error;
|
|
6
6
|
graphRef: string;
|
|
@@ -44,7 +44,7 @@ export declare class UplinkSupergraphManager implements SupergraphManager {
|
|
|
44
44
|
fallbackPollIntervalInMs?: number;
|
|
45
45
|
maxRetries?: number;
|
|
46
46
|
initialMaxRetries?: number;
|
|
47
|
-
fetcher?:
|
|
47
|
+
fetcher?: Fetcher;
|
|
48
48
|
shouldRunSubgraphHealthcheck?: boolean;
|
|
49
49
|
onFailureToFetchSupergraphSdlDuringInit?: FailureToFetchSupergraphSdlDuringInit;
|
|
50
50
|
onFailureToFetchSupergraphSdlAfterInit?: FailureToFetchSupergraphSdlAfterInit;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkSupergraphManager/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkSupergraphManager/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAQ3E,oBAAY,yCAAyC,GAAG;IACtD,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,oBAAY,qCAAqC,GAAG,CAAC,EACnD,KAAK,EACL,QAAQ,EACR,MAAM,EACN,UAAU,GACX,EAAE,yCAAyC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEjE,oBAAY,oCAAoC,GAAG,CAAC,EAClD,KAAK,EACL,QAAQ,EACR,MAAM,EACN,UAAU,EACV,2BAA2B,GAC5B,EACG,yCAAyC,GAAG;IAC1C,2BAA2B,CAAC,EAAE,IAAI,CAAC;CACpC,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;AAYjC,qBAAa,uBAAwB,YAAW,iBAAiB;IAC/D,gBAAuB,0BAA0B,SAAU;IAC3D,gBAAuB,oBAAoB,SAAU;IAErD,gBAAuB,wBAAwB,WAG7C;IAEF,SAAgB,eAAe,EAAE,MAAM,EAAE,CACM;IAC/C,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,OAAO,CAAuC;IACtD,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,gBAAgB,CAC6B;IACrD,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,cAAc,CAAwD;IAC9E,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAC,CAA8B;IAC7C,OAAO,CAAC,4BAA4B,CAAkB;IACtD,OAAO,CAAC,WAAW,CAAC,CAA8B;IAClD,OAAO,CAAC,uCAAuC,CAAC,CAAwC;IACxF,OAAO,CAAC,sCAAsC,CAAC,CAAuC;IACtF,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,sBAAsB,CACkC;IAChE,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,2BAA2B,CAAC,CAAO;gBAE/B,EACV,MAAM,EACN,QAAQ,EACR,KAAK,EACL,MAAM,EACN,eAAe,EACf,wBAAwB,EACxB,UAAU,EACV,iBAAiB,EACjB,OAAO,EACP,4BAA4B,EAC5B,uCAAuC,EACvC,sCAAsC,GACvC,EAAE;QACD,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3B,wBAAwB,CAAC,EAAE,MAAM,CAAC;QAClC,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,4BAA4B,CAAC,EAAE,OAAO,CAAC;QACvC,uCAAuC,CAAC,EAAE,qCAAqC,CAAC;QAChF,sCAAsC,CAAC,EAAE,oCAAoC,CAAC;KAC/E;IAgCY,UAAU,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,wBAAwB;;;;IA0C5D,SAAS,IAAI,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;WAYhC,kBAAkB,IAAI,MAAM,EAAE;YAM9B,mBAAmB;IA2EjC,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,IAAI;IA+BZ,OAAO,CAAC,gBAAgB;CAMzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkSupergraphManager/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAqD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkSupergraphManager/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { SupergraphSdlUpdate } from '../../config';
|
|
2
|
+
import type { Fetcher } from '@apollo/utils.fetcher';
|
|
2
3
|
import type { Logger } from '@apollo/utils.logger';
|
|
3
|
-
import type { AbortableFetcher as Fetcher } from './types';
|
|
4
4
|
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";
|
|
5
5
|
export declare class UplinkFetcherError extends Error {
|
|
6
6
|
constructor(message: string);
|
package/dist/supergraphManagers/UplinkSupergraphManager/loadSupergraphSdlFromStorage.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadSupergraphSdlFromStorage.d.ts","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkSupergraphManager/loadSupergraphSdlFromStorage.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"loadSupergraphSdlFromStorage.d.ts","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkSupergraphManager/loadSupergraphSdlFromStorage.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGnD,OAAO,KAAK,EAEV,OAAO,EAER,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGnD,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,gBAAgB,EAChB,cAAc,EACd,MAAM,GACP,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,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAI,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAwBvC;AAED,wBAAsB,4BAA4B,CAAC,EACjD,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,sBAAsB,EACtB,OAAO,EACP,gBAAgB,EAChB,aAAa,EACb,MAAM,GACP,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,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB,GAAI,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAsGvC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { FetcherResponse } from '@apollo/utils.fetcher';
|
|
2
|
-
import { type AbortableFetcher as Fetcher } from './types';
|
|
1
|
+
import { FetcherResponse, type Fetcher } from '@apollo/utils.fetcher';
|
|
3
2
|
export declare const OUT_OF_BAND_REPORTER_QUERY = "#graphql\n mutation OOBReport($input: APIMonitoringReport) {\n reportError(report: $input)\n }\n";
|
|
4
3
|
export declare function submitOutOfBandReportIfConfigured({ error, requestEndpoint, requestBody, endpoint, response, startedAt, endedAt, tags, fetcher, }: {
|
|
5
4
|
error: Error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outOfBandReporter.d.ts","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkSupergraphManager/outOfBandReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"outOfBandReporter.d.ts","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkSupergraphManager/outOfBandReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,KAAK,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAStE,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outOfBandReporter.js","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkSupergraphManager/outOfBandReporter.ts"],"names":[],"mappings":";;;AAEA,mEAI0C;
|
|
1
|
+
{"version":3,"file":"outOfBandReporter.js","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkSupergraphManager/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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@apollo/gateway",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.1",
|
|
4
4
|
"description": "Apollo Gateway",
|
|
5
5
|
"author": "Apollo <packages@apollographql.com>",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -25,17 +25,17 @@
|
|
|
25
25
|
"access": "public"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@apollo/composition": "^2.1.
|
|
29
|
-
"@apollo/
|
|
30
|
-
"@apollo/
|
|
31
|
-
"@apollo/
|
|
32
|
-
"@apollo/server-gateway-interface": "^1.0.1",
|
|
28
|
+
"@apollo/composition": "^2.1.1",
|
|
29
|
+
"@apollo/federation-internals": "^2.1.1",
|
|
30
|
+
"@apollo/query-planner": "^2.1.1",
|
|
31
|
+
"@apollo/server-gateway-interface": "^1.0.2",
|
|
33
32
|
"@apollo/utils.createhash": "^1.1.0",
|
|
34
|
-
"@apollo/utils.fetcher": "^1.
|
|
33
|
+
"@apollo/utils.fetcher": "^1.1.0",
|
|
35
34
|
"@apollo/utils.isnodelike": "^1.1.0",
|
|
36
35
|
"@apollo/utils.logger": "^1.0.0",
|
|
37
36
|
"@josephg/resolvable": "^1.0.1",
|
|
38
37
|
"@opentelemetry/api": "^1.0.1",
|
|
38
|
+
"@types/node-fetch": "^2.6.2",
|
|
39
39
|
"apollo-reporting-protobuf": "^0.8.0 || ^3.0.0",
|
|
40
40
|
"async-retry": "^1.3.3",
|
|
41
41
|
"loglevel": "^1.6.1",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"node-fetch": "^2.6.7"
|
|
46
46
|
},
|
|
47
47
|
"peerDependencies": {
|
|
48
|
-
"graphql": "^16.
|
|
48
|
+
"graphql": "^16.5.0"
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "838a8e4f6f2ce0167f4f928664f605845be315ac"
|
|
51
51
|
}
|
|
@@ -2938,6 +2938,140 @@ describe('executeQueryPlan', () => {
|
|
|
2938
2938
|
}
|
|
2939
2939
|
`);
|
|
2940
2940
|
});
|
|
2941
|
+
|
|
2942
|
+
test('correctly include key/typename when top-level required object is non-external', async () => {
|
|
2943
|
+
const entityTwo = {
|
|
2944
|
+
id: 'key2',
|
|
2945
|
+
external: 'v2',
|
|
2946
|
+
};
|
|
2947
|
+
const entityOne = {
|
|
2948
|
+
id: 'key1',
|
|
2949
|
+
two: { id: entityTwo.id },
|
|
2950
|
+
};
|
|
2951
|
+
|
|
2952
|
+
const s1 = {
|
|
2953
|
+
name: 'S1',
|
|
2954
|
+
typeDefs: gql`
|
|
2955
|
+
type Query {
|
|
2956
|
+
one: One
|
|
2957
|
+
}
|
|
2958
|
+
|
|
2959
|
+
type One @key(fields: "id") {
|
|
2960
|
+
id: ID!
|
|
2961
|
+
two: Two
|
|
2962
|
+
computed: String @requires(fields: "two { external }")
|
|
2963
|
+
}
|
|
2964
|
+
|
|
2965
|
+
type Two @key(fields: "id") {
|
|
2966
|
+
id: ID!
|
|
2967
|
+
external: String @external
|
|
2968
|
+
}
|
|
2969
|
+
`,
|
|
2970
|
+
resolvers: {
|
|
2971
|
+
Query: {
|
|
2972
|
+
one() {
|
|
2973
|
+
return entityOne;
|
|
2974
|
+
},
|
|
2975
|
+
},
|
|
2976
|
+
One: {
|
|
2977
|
+
__resolveReference(ref: { id: string }) {
|
|
2978
|
+
return ref.id === entityOne.id ? { ...entityOne, ...ref } : undefined;
|
|
2979
|
+
},
|
|
2980
|
+
computed(parent: any) {
|
|
2981
|
+
return `computed value: ${parent.two.external}`;
|
|
2982
|
+
},
|
|
2983
|
+
},
|
|
2984
|
+
}
|
|
2985
|
+
}
|
|
2986
|
+
|
|
2987
|
+
const s2 = {
|
|
2988
|
+
name: 'S2',
|
|
2989
|
+
typeDefs: gql`
|
|
2990
|
+
type Two @key(fields: "id") {
|
|
2991
|
+
id: ID!
|
|
2992
|
+
external: String
|
|
2993
|
+
}
|
|
2994
|
+
`,
|
|
2995
|
+
resolvers: {
|
|
2996
|
+
Two: {
|
|
2997
|
+
__resolveReference(ref: { id: string }) {
|
|
2998
|
+
return ref.id === entityTwo.id ? entityTwo : undefined;
|
|
2999
|
+
},
|
|
3000
|
+
},
|
|
3001
|
+
}
|
|
3002
|
+
}
|
|
3003
|
+
|
|
3004
|
+
const { serviceMap, schema, queryPlanner} = getFederatedTestingSchema([ s1, s2 ]);
|
|
3005
|
+
|
|
3006
|
+
const operation = parseOp(`
|
|
3007
|
+
{
|
|
3008
|
+
one {
|
|
3009
|
+
computed
|
|
3010
|
+
}
|
|
3011
|
+
}
|
|
3012
|
+
`, schema);
|
|
3013
|
+
const queryPlan = buildPlan(operation, queryPlanner);
|
|
3014
|
+
expect(queryPlan).toMatchInlineSnapshot(`
|
|
3015
|
+
QueryPlan {
|
|
3016
|
+
Sequence {
|
|
3017
|
+
Fetch(service: "S1") {
|
|
3018
|
+
{
|
|
3019
|
+
one {
|
|
3020
|
+
__typename
|
|
3021
|
+
two {
|
|
3022
|
+
__typename
|
|
3023
|
+
id
|
|
3024
|
+
}
|
|
3025
|
+
id
|
|
3026
|
+
}
|
|
3027
|
+
}
|
|
3028
|
+
},
|
|
3029
|
+
Flatten(path: "one.two") {
|
|
3030
|
+
Fetch(service: "S2") {
|
|
3031
|
+
{
|
|
3032
|
+
... on Two {
|
|
3033
|
+
__typename
|
|
3034
|
+
id
|
|
3035
|
+
}
|
|
3036
|
+
} =>
|
|
3037
|
+
{
|
|
3038
|
+
... on Two {
|
|
3039
|
+
external
|
|
3040
|
+
}
|
|
3041
|
+
}
|
|
3042
|
+
},
|
|
3043
|
+
},
|
|
3044
|
+
Flatten(path: "one") {
|
|
3045
|
+
Fetch(service: "S1") {
|
|
3046
|
+
{
|
|
3047
|
+
... on One {
|
|
3048
|
+
__typename
|
|
3049
|
+
two {
|
|
3050
|
+
external
|
|
3051
|
+
}
|
|
3052
|
+
id
|
|
3053
|
+
}
|
|
3054
|
+
} =>
|
|
3055
|
+
{
|
|
3056
|
+
... on One {
|
|
3057
|
+
computed
|
|
3058
|
+
}
|
|
3059
|
+
}
|
|
3060
|
+
},
|
|
3061
|
+
},
|
|
3062
|
+
},
|
|
3063
|
+
}
|
|
3064
|
+
`);
|
|
3065
|
+
const response = await executePlan(queryPlan, operation, undefined, schema, serviceMap);
|
|
3066
|
+
expect(response.errors).toBeUndefined();
|
|
3067
|
+
expect(response.data).toMatchInlineSnapshot(`
|
|
3068
|
+
Object {
|
|
3069
|
+
"one": Object {
|
|
3070
|
+
"computed": "computed value: v2",
|
|
3071
|
+
},
|
|
3072
|
+
}
|
|
3073
|
+
`);
|
|
3074
|
+
});
|
|
2941
3075
|
});
|
|
2942
3076
|
|
|
2943
3077
|
describe('@key', () => {
|
|
@@ -4,6 +4,7 @@ import fetcher from 'make-fetch-happen';
|
|
|
4
4
|
import { ApolloGateway, UplinkSupergraphManager } from '@apollo/gateway';
|
|
5
5
|
import { ApolloServer } from 'apollo-server';
|
|
6
6
|
import { ApolloServerPluginUsageReportingDisabled } from 'apollo-server-core';
|
|
7
|
+
import type { FetcherRequestInit } from '@apollo/utils.fetcher';
|
|
7
8
|
|
|
8
9
|
import { nockAfterEach, nockBeforeEach } from '../nockAssertions';
|
|
9
10
|
import {
|
|
@@ -117,9 +118,9 @@ describe('minimal gateway', () => {
|
|
|
117
118
|
let calls = 0;
|
|
118
119
|
gateway = new ApolloGateway({
|
|
119
120
|
logger,
|
|
120
|
-
fetcher: (
|
|
121
|
+
fetcher: (url: string, init?: FetcherRequestInit) => {
|
|
121
122
|
calls++;
|
|
122
|
-
return fetcher(
|
|
123
|
+
return fetcher(url, init);
|
|
123
124
|
},
|
|
124
125
|
});
|
|
125
126
|
server = new ApolloServer({
|
|
@@ -106,7 +106,9 @@ export class RemoteGraphQLDataSource<
|
|
|
106
106
|
// there.
|
|
107
107
|
const overallCachePolicy =
|
|
108
108
|
this.honorSubgraphCacheControlHeader &&
|
|
109
|
-
options.kind === GraphQLDataSourceRequestKind.INCOMING_OPERATION
|
|
109
|
+
options.kind === GraphQLDataSourceRequestKind.INCOMING_OPERATION &&
|
|
110
|
+
options.incomingRequestContext.overallCachePolicy &&
|
|
111
|
+
'restrict' in options.incomingRequestContext.overallCachePolicy
|
|
110
112
|
? options.incomingRequestContext.overallCachePolicy
|
|
111
113
|
: null;
|
|
112
114
|
|
|
@@ -3,9 +3,63 @@ import { addExtensions } from '../addExtensions';
|
|
|
3
3
|
const { version } = require('../../../package.json');
|
|
4
4
|
|
|
5
5
|
describe('addExtensions', () => {
|
|
6
|
+
|
|
6
7
|
it('adds gateway extensions to a schema', async () => {
|
|
7
8
|
const schema = buildSchema('type Query { hello: String }');
|
|
8
9
|
expect(schema.extensions).toEqual({});
|
|
9
10
|
expect(addExtensions(schema).extensions).toEqual({ apollo: { gateway: { version: version } } });
|
|
10
11
|
});
|
|
12
|
+
|
|
13
|
+
it('does not delete existing extensions', async () => {
|
|
14
|
+
const schema = buildSchema('type Query { hello: String }');
|
|
15
|
+
expect(schema.extensions).toEqual({});
|
|
16
|
+
schema.extensions = {
|
|
17
|
+
foo: 'bar',
|
|
18
|
+
apollo: {
|
|
19
|
+
gateway: {
|
|
20
|
+
version: 'hello'
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
};
|
|
24
|
+
expect(addExtensions(schema).extensions).toEqual({
|
|
25
|
+
foo: 'bar',
|
|
26
|
+
apollo: {
|
|
27
|
+
gateway: {
|
|
28
|
+
version: version
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
it('works with undefined apollo block', async () => {
|
|
35
|
+
const schema = buildSchema('type Query { hello: String }');
|
|
36
|
+
expect(schema.extensions).toEqual({});
|
|
37
|
+
schema.extensions = {
|
|
38
|
+
apollo: undefined
|
|
39
|
+
};
|
|
40
|
+
expect(addExtensions(schema).extensions).toEqual({
|
|
41
|
+
apollo: {
|
|
42
|
+
gateway: {
|
|
43
|
+
version: version
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
it('works with undefined gateway block', async () => {
|
|
50
|
+
const schema = buildSchema('type Query { hello: String }');
|
|
51
|
+
expect(schema.extensions).toEqual({});
|
|
52
|
+
schema.extensions = {
|
|
53
|
+
apollo: {
|
|
54
|
+
gateway: undefined
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
expect(addExtensions(schema).extensions).toEqual({
|
|
58
|
+
apollo: {
|
|
59
|
+
gateway: {
|
|
60
|
+
version: version
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
});
|
|
11
65
|
});
|
|
@@ -1,13 +1,19 @@
|
|
|
1
1
|
import { GraphQLSchema } from 'graphql';
|
|
2
|
+
import { GraphQLSchemaExtensions } from 'graphql/type/schema';
|
|
3
|
+
|
|
2
4
|
const { version } = require('../../package.json');
|
|
3
5
|
|
|
4
6
|
export function addExtensions(schema: GraphQLSchema): GraphQLSchema {
|
|
7
|
+
const schemaExtension = schema.extensions as GraphQLSchemaExtensions ?? {};
|
|
8
|
+
const apolloExtension = schemaExtension?.apollo ?? {};
|
|
9
|
+
const gatewayExtension = apolloExtension?.gateway ?? {};
|
|
10
|
+
|
|
5
11
|
schema.extensions = {
|
|
6
12
|
...schema.extensions,
|
|
7
13
|
apollo: {
|
|
8
|
-
...
|
|
14
|
+
...apolloExtension,
|
|
9
15
|
gateway: {
|
|
10
|
-
...
|
|
16
|
+
...gatewayExtension,
|
|
11
17
|
version,
|
|
12
18
|
}
|
|
13
19
|
},
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import nock from 'nock';
|
|
1
2
|
import {
|
|
2
3
|
loadSupergraphSdlFromStorage,
|
|
3
4
|
loadSupergraphSdlFromUplinks,
|
|
@@ -21,6 +22,7 @@ import {
|
|
|
21
22
|
nockAfterEach,
|
|
22
23
|
nockBeforeEach,
|
|
23
24
|
} from '../../../__tests__/nockAssertions';
|
|
25
|
+
import { FetcherRequestInit } from '@apollo/utils.fetcher';
|
|
24
26
|
|
|
25
27
|
const logger = {
|
|
26
28
|
warn: jest.fn(),
|
|
@@ -90,6 +92,48 @@ describe('loadSupergraphSdlFromStorage', () => {
|
|
|
90
92
|
});
|
|
91
93
|
});
|
|
92
94
|
|
|
95
|
+
it('Queries alternate Uplink URL if first one times out', async () => {
|
|
96
|
+
mockSupergraphSdlRequest('originalId-1234', mockCloudConfigUrl1).delay(120_000).reply(500);
|
|
97
|
+
mockSupergraphSdlRequestIfAfter(
|
|
98
|
+
'originalId-1234',
|
|
99
|
+
mockCloudConfigUrl2,
|
|
100
|
+
).reply(
|
|
101
|
+
200,
|
|
102
|
+
JSON.stringify({
|
|
103
|
+
data: {
|
|
104
|
+
routerConfig: {
|
|
105
|
+
__typename: 'RouterConfigResult',
|
|
106
|
+
id: 'originalId-1234',
|
|
107
|
+
supergraphSdl: getTestingSupergraphSdl(),
|
|
108
|
+
},
|
|
109
|
+
},
|
|
110
|
+
}),
|
|
111
|
+
);
|
|
112
|
+
|
|
113
|
+
const result = await loadSupergraphSdlFromUplinks({
|
|
114
|
+
graphRef,
|
|
115
|
+
apiKey,
|
|
116
|
+
endpoints: [mockCloudConfigUrl1, mockCloudConfigUrl2],
|
|
117
|
+
errorReportingEndpoint: undefined,
|
|
118
|
+
fetcher,
|
|
119
|
+
requestTimeoutMs,
|
|
120
|
+
compositionId: 'originalId-1234',
|
|
121
|
+
maxRetries: 1,
|
|
122
|
+
roundRobinSeed: 0,
|
|
123
|
+
logger,
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
expect(result).toMatchObject({
|
|
127
|
+
id: 'originalId-1234',
|
|
128
|
+
supergraphSdl: getTestingSupergraphSdl(),
|
|
129
|
+
});
|
|
130
|
+
|
|
131
|
+
// We're intentionally delaying the response above, so we need to make sure
|
|
132
|
+
// nock shuts down correctly, and isn't related to the underlying abort
|
|
133
|
+
// mechanism.
|
|
134
|
+
nock.abortPendingRequests();
|
|
135
|
+
});
|
|
136
|
+
|
|
93
137
|
it('Throws error if all Uplink URLs fail', async () => {
|
|
94
138
|
mockSupergraphSdlRequest('originalId-1234', mockCloudConfigUrl1).reply(500);
|
|
95
139
|
mockSupergraphSdlRequestIfAfter(
|
|
@@ -417,9 +461,9 @@ describe('loadSupergraphSdlFromUplinks', () => {
|
|
|
417
461
|
apiKey,
|
|
418
462
|
endpoints: [mockCloudConfigUrl1, mockCloudConfigUrl2],
|
|
419
463
|
errorReportingEndpoint: mockOutOfBandReporterUrl,
|
|
420
|
-
fetcher: (
|
|
464
|
+
fetcher: (url: string, init?: FetcherRequestInit) => {
|
|
421
465
|
calls++;
|
|
422
|
-
return fetcher(
|
|
466
|
+
return fetcher(url, init);
|
|
423
467
|
},
|
|
424
468
|
requestTimeoutMs,
|
|
425
469
|
compositionId: 'id-1234',
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as makeFetchHappen from 'make-fetch-happen';
|
|
2
2
|
import type { Logger } from '@apollo/utils.logger';
|
|
3
|
+
import type { Fetcher } from '@apollo/utils.fetcher';
|
|
3
4
|
import resolvable, { Resolvable } from '@josephg/resolvable';
|
|
4
5
|
import { SupergraphManager, SupergraphSdlHookOptions } from '../../config';
|
|
5
6
|
import {
|
|
@@ -8,7 +9,6 @@ import {
|
|
|
8
9
|
} from '../..';
|
|
9
10
|
import { getDefaultLogger } from '../../logger';
|
|
10
11
|
import { loadSupergraphSdlFromUplinks } from './loadSupergraphSdlFromStorage';
|
|
11
|
-
import type { AbortableFetcher } from './types';
|
|
12
12
|
|
|
13
13
|
export type FailureToFetchSupergraphSdlFunctionParams = {
|
|
14
14
|
error: Error;
|
|
@@ -58,7 +58,7 @@ export class UplinkSupergraphManager implements SupergraphManager {
|
|
|
58
58
|
UplinkSupergraphManager.getUplinkEndpoints();
|
|
59
59
|
private apiKey: string;
|
|
60
60
|
private graphRef: string;
|
|
61
|
-
private fetcher:
|
|
61
|
+
private fetcher: Fetcher = makeFetchHappen.defaults();
|
|
62
62
|
private maxRetries: number;
|
|
63
63
|
private requestTimeoutMs: number =
|
|
64
64
|
UplinkSupergraphManager.DEFAULT_REQUEST_TIMEOUT_MS;
|
|
@@ -100,7 +100,7 @@ export class UplinkSupergraphManager implements SupergraphManager {
|
|
|
100
100
|
fallbackPollIntervalInMs?: number;
|
|
101
101
|
maxRetries?: number;
|
|
102
102
|
initialMaxRetries?: number;
|
|
103
|
-
fetcher?:
|
|
103
|
+
fetcher?: Fetcher;
|
|
104
104
|
shouldRunSubgraphHealthcheck?: boolean;
|
|
105
105
|
onFailureToFetchSupergraphSdlDuringInit?: FailureToFetchSupergraphSdlDuringInit;
|
|
106
106
|
onFailureToFetchSupergraphSdlAfterInit?: FailureToFetchSupergraphSdlAfterInit;
|
|
@@ -4,12 +4,12 @@ import { AbortController } from "node-abort-controller";
|
|
|
4
4
|
import { SupergraphSdlUpdate } from '../../config';
|
|
5
5
|
import { submitOutOfBandReportIfConfigured } from './outOfBandReporter';
|
|
6
6
|
import { SupergraphSdlQuery } from '../../__generated__/graphqlTypes';
|
|
7
|
-
import type { FetcherResponse } from '@apollo/utils.fetcher';
|
|
8
|
-
import type { Logger } from '@apollo/utils.logger';
|
|
9
7
|
import type {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
8
|
+
FetcherResponse,
|
|
9
|
+
Fetcher,
|
|
10
|
+
FetcherRequestInit,
|
|
11
|
+
} from '@apollo/utils.fetcher';
|
|
12
|
+
import type { Logger } from '@apollo/utils.logger';
|
|
13
13
|
|
|
14
14
|
// Magic /* GraphQL */ comment below is for codegen, do not remove
|
|
15
15
|
export const SUPERGRAPH_SDL_QUERY = /* GraphQL */`#graphql
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import { FetcherResponse } from '@apollo/utils.fetcher';
|
|
1
|
+
import { FetcherResponse, type Fetcher } from '@apollo/utils.fetcher';
|
|
2
2
|
import { GraphQLError } from 'graphql';
|
|
3
3
|
import {
|
|
4
4
|
ErrorCode,
|
|
5
5
|
OobReportMutation,
|
|
6
6
|
OobReportMutationVariables,
|
|
7
7
|
} from '../../__generated__/graphqlTypes';
|
|
8
|
-
import { type AbortableFetcher as Fetcher } from './types';
|
|
9
8
|
|
|
10
9
|
// Magic /* GraphQL */ comment below is for codegen, do not remove
|
|
11
10
|
export const OUT_OF_BAND_REPORTER_QUERY = /* GraphQL */`#graphql
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import type { AbortSignal } from 'node-abort-controller';
|
|
2
|
-
import type { Fetcher, FetcherRequestInit } from '@apollo/utils.fetcher';
|
|
3
|
-
export interface AbortableFetcherRequestInit extends FetcherRequestInit {
|
|
4
|
-
signal?: AbortSignal | null | undefined;
|
|
5
|
-
}
|
|
6
|
-
export interface AbortableFetcher extends Fetcher {
|
|
7
|
-
init?: AbortableFetcherRequestInit;
|
|
8
|
-
}
|
|
9
|
-
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkSupergraphManager/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEzE,MAAM,WAAW,2BAA4B,SAAQ,kBAAkB;IACrE,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC;CACzC;AAED,MAAM,WAAW,gBAAiB,SAAQ,OAAO;IAC/C,IAAI,CAAC,EAAE,2BAA2B,CAAC;CACpC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/supergraphManagers/UplinkSupergraphManager/types.ts"],"names":[],"mappings":";;AAKC,CAAC;AAID,CAAC"}
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import type { AbortSignal } from 'node-abort-controller';
|
|
2
|
-
import type { Fetcher, FetcherRequestInit } from '@apollo/utils.fetcher';
|
|
3
|
-
|
|
4
|
-
export interface AbortableFetcherRequestInit extends FetcherRequestInit {
|
|
5
|
-
signal?: AbortSignal | null | undefined;
|
|
6
|
-
};
|
|
7
|
-
|
|
8
|
-
export interface AbortableFetcher extends Fetcher {
|
|
9
|
-
init?: AbortableFetcherRequestInit;
|
|
10
|
-
};
|