@apollo/gateway 0.43.1 → 0.44.0
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/CHANGELOG.md +5 -0
- package/dist/__generated__/graphqlTypes.d.ts +2 -1
- package/dist/__generated__/graphqlTypes.d.ts.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -2
- package/dist/index.js.map +1 -1
- package/dist/loadSupergraphSdlFromStorage.d.ts +4 -3
- package/dist/loadSupergraphSdlFromStorage.d.ts.map +1 -1
- package/dist/loadSupergraphSdlFromStorage.js +7 -3
- package/dist/loadSupergraphSdlFromStorage.js.map +1 -1
- package/package.json +5 -5
- package/src/__generated__/graphqlTypes.ts +2 -1
- package/src/__tests__/integration/networkRequests.test.ts +22 -10
- package/src/__tests__/integration/nockMocks.ts +33 -5
- package/src/__tests__/loadSupergraphSdlFromStorage.test.ts +30 -0
- package/src/index.ts +10 -1
- package/src/loadSupergraphSdlFromStorage.ts +7 -4
package/CHANGELOG.md
CHANGED
|
@@ -6,6 +6,11 @@
|
|
|
6
6
|
|
|
7
7
|
- _Nothing yet. Stay tuned._
|
|
8
8
|
|
|
9
|
+
## v0.44.0
|
|
10
|
+
|
|
11
|
+
- __BREAKING__: Update `@apollo/core-schema` usage and `graphql` peerDependencies. The core schema package suffered from incompatible changes in the latest graphql versions (^15.7.0). The core schema has since been updated. This updates our usage to the latest version, but in doing so requires us to update our peerDependency requirement of graphql-js to the latest v15 release (15.7.2) [PR #1140](https://github.com/apollographql/federation/pull/1140)
|
|
12
|
+
- Conditional schema update based on ifAfterId [PR #TODO](https://github.com/apollographql/federation/pull/TODO)
|
|
13
|
+
|
|
9
14
|
## v0.43.0
|
|
10
15
|
|
|
11
16
|
- Skip fetches when possible (based on @skip and @include usages). The query planner now aggregates top-level skip and include usages, which allows the gateway to skip `FetchNode`s altogether when possible during execution. [PR #1113](https://github.com/apollographql/federation/pull/1113)
|
|
@@ -76,8 +76,8 @@ export declare type Query = {
|
|
|
76
76
|
};
|
|
77
77
|
export declare type QueryRouterConfigArgs = {
|
|
78
78
|
apiKey: Scalars['String'];
|
|
79
|
+
ifAfterId?: Maybe<Scalars['ID']>;
|
|
79
80
|
ref: Scalars['String'];
|
|
80
|
-
unlessIdIn?: Maybe<Array<Scalars['ID']>>;
|
|
81
81
|
};
|
|
82
82
|
export declare type Request = {
|
|
83
83
|
body?: Maybe<Scalars['String']>;
|
|
@@ -103,6 +103,7 @@ export declare type Unchanged = {
|
|
|
103
103
|
export declare type SupergraphSdlQueryVariables = Exact<{
|
|
104
104
|
apiKey: Scalars['String'];
|
|
105
105
|
ref: Scalars['String'];
|
|
106
|
+
ifAfterId?: Maybe<Scalars['ID']>;
|
|
106
107
|
}>;
|
|
107
108
|
export declare type SupergraphSdlQuery = {
|
|
108
109
|
__typename?: 'Query';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphqlTypes.d.ts","sourceRoot":"","sources":["../../src/__generated__/graphqlTypes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"graphqlTypes.d.ts","sourceRoot":"","sources":["../../src/__generated__/graphqlTypes.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EACL,sBAAsB,EAEtB,sCAAsC,EACvC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAGL,aAAa,EAMd,MAAM,SAAS,CAAC;AAQjB,OAAO,EAAE,qBAAqB,EAAoB,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EACL,gBAAgB,EAChB,UAAU,EAEX,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAgC,MAAM,qBAAqB,CAAC;AAYtF,OAAO,EACL,yBAAyB,EACzB,uCAAuC,EACvC,wCAAwC,EACxC,yCAAyC,EACzC,8BAA8B,EAC9B,eAAe,EACf,aAAa,EAEb,mBAAmB,EACnB,oBAAoB,EAYpB,iBAAiB,EAGlB,MAAM,UAAU,CAAC;AASlB,aAAK,aAAa,GAAG;IACnB,CAAC,WAAW,EAAE,MAAM,GAAG;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,iBAAiB,CAAA;KAAE,CAAC;CACxE,CAAC;AAWF,wBAAgB,iBAAiB;;EAsBhC;AAMD,eAAO,MAAM,oBAAoB,0BAGhC,CAAC;AAKF,eAAO,MAAM,eAAe,IAAI,CAAC;AAEjC,eAAO,MAAM,kBAAkB,sDACsB,CAAC;AACtD,eAAO,MAAM,wBAAwB,8DACwB,CAAC;AA2B9D,UAAU,sBAAsB;IAC9B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAID,UAAU,0BAA0B;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,qBAAa,aAAc,YAAW,cAAc;IAC3C,MAAM,CAAC,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,UAAU,CAAsC;IACxD,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,YAAY,CAAC,CAAsB;IAC3C,OAAO,CAAC,uBAAuB,CAA8C;IAC7E,OAAO,CAAC,6BAA6B,CAKjC;IACJ,OAAO,CAAC,kBAAkB,CAA2B;IACrD,OAAO,CAAC,mBAAmB,CAAC,CAAsB;IAClD,OAAO,CAAC,eAAe,CAA6B;IACpD,OAAO,CAAC,YAAY,CAAqC;IACzD,OAAO,CAAC,YAAY,CAAC,CAAe;IACpC,OAAO,CAAC,mBAAmB,CAAC,CAAe;IAC3C,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,KAAK,CAAe;IAK5B,OAAO,CAAC,gCAAgC,CAAC,CAA2C;IAIpF,OAAO,CAAC,+BAA+B,CAAC,CAA0C;IAGlF,OAAO,CAAC,iCAAiC,CAAC,CAA4C;IAGtF,OAAO,CAAC,wBAAwB,CAAiC;IAEjE,OAAO,CAAC,yBAAyB,CAAC,CAAS;IAM3C,OAAO,CAAC,4BAA4B,CAAC,CAAgB;gBAEzC,MAAM,CAAC,EAAE,aAAa;IAiElC,OAAO,CAAC,UAAU;IAmBlB,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,gCAAgC;IAwC3B,IAAI,CAAC,OAAO,CAAC,EAAE;QAC1B,MAAM,CAAC,EAAE,sBAAsB,CAAC;QAChC,MAAM,CAAC,EAAE,0BAA0B,CAAC;KACrC;;;;IA8ED,OAAO,CAAC,UAAU;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -284,6 +284,7 @@ class ApolloGateway {
|
|
|
284
284
|
? this.createSchemaFromServiceList(config.localServiceList)
|
|
285
285
|
: this.createSchemaFromSupergraphSdl(config.supergraphSdl));
|
|
286
286
|
this.parsedSupergraphSdl = (0, graphql_1.parse)(supergraphSdl);
|
|
287
|
+
this.supergraphSdl = supergraphSdl;
|
|
287
288
|
this.updateWithSchemaAndNotify(schema, supergraphSdl, true);
|
|
288
289
|
}
|
|
289
290
|
catch (e) {
|
|
@@ -375,6 +376,7 @@ class ApolloGateway {
|
|
|
375
376
|
}
|
|
376
377
|
await this.maybePerformServiceHealthCheck(result);
|
|
377
378
|
this.compositionId = result.id;
|
|
379
|
+
this.supergraphSdl = result.supergraphSdl;
|
|
378
380
|
this.parsedSupergraphSdl = parsedSupergraphSdl;
|
|
379
381
|
const { schema, supergraphSdl } = this.createSchemaFromSupergraphSdl(result.supergraphSdl);
|
|
380
382
|
if (!supergraphSdl) {
|
|
@@ -609,7 +611,7 @@ class ApolloGateway {
|
|
|
609
611
|
}
|
|
610
612
|
}
|
|
611
613
|
async loadServiceDefinitions(config) {
|
|
612
|
-
var _a, _b;
|
|
614
|
+
var _a, _b, _c;
|
|
613
615
|
if ((0, config_1.isRemoteConfig)(config)) {
|
|
614
616
|
const serviceList = config.serviceList.map((serviceDefinition) => ({
|
|
615
617
|
...serviceDefinition,
|
|
@@ -633,12 +635,17 @@ class ApolloGateway {
|
|
|
633
635
|
'`serviceList`, `supergraphSdl`, and `experimental_updateServiceDefinitions`.');
|
|
634
636
|
}
|
|
635
637
|
if ((0, config_1.isPrecomposedManagedConfig)(config)) {
|
|
636
|
-
|
|
638
|
+
const result = await (0, loadSupergraphSdlFromStorage_1.loadSupergraphSdlFromStorage)({
|
|
637
639
|
graphRef: this.apolloConfig.graphRef,
|
|
638
640
|
apiKey: this.apolloConfig.key,
|
|
639
641
|
endpoint: this.schemaConfigDeliveryEndpoint,
|
|
640
642
|
fetcher: this.fetcher,
|
|
643
|
+
compositionId: (_c = this.compositionId) !== null && _c !== void 0 ? _c : null,
|
|
641
644
|
});
|
|
645
|
+
return result !== null && result !== void 0 ? result : {
|
|
646
|
+
id: this.compositionId,
|
|
647
|
+
supergraphSdl: this.supergraphSdl,
|
|
648
|
+
};
|
|
642
649
|
}
|
|
643
650
|
else if ((0, config_1.isLegacyManagedConfig)(config)) {
|
|
644
651
|
return (0, legacyLoadServicesFromStorage_1.getServiceDefinitionsFromStorage)({
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { fetch } from 'apollo-server-env';
|
|
2
|
-
export declare const SUPERGRAPH_SDL_QUERY = "#graphql\n query SupergraphSdl($apiKey: String!, $ref: String
|
|
3
|
-
export declare function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetcher, }: {
|
|
2
|
+
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 }\n ... on FetchError {\n code\n message\n }\n }\n }\n";
|
|
3
|
+
export declare function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetcher, compositionId, }: {
|
|
4
4
|
graphRef: string;
|
|
5
5
|
apiKey: string;
|
|
6
6
|
endpoint: string;
|
|
7
7
|
fetcher: typeof fetch;
|
|
8
|
+
compositionId: string | null;
|
|
8
9
|
}): Promise<{
|
|
9
10
|
id: string;
|
|
10
11
|
supergraphSdl: string;
|
|
11
|
-
}>;
|
|
12
|
+
} | null>;
|
|
12
13
|
//# sourceMappingURL=loadSupergraphSdlFromStorage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadSupergraphSdlFromStorage.d.ts","sourceRoot":"","sources":["../src/loadSupergraphSdlFromStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,mBAAmB,CAAC;AAM7D,eAAO,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"loadSupergraphSdlFromStorage.d.ts","sourceRoot":"","sources":["../src/loadSupergraphSdlFromStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,mBAAmB,CAAC;AAM7D,eAAO,MAAM,oBAAoB,+VAchC,CAAC;AAoBF,wBAAsB,4BAA4B,CAAC,EACjD,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,OAAO,EACP,aAAa,GACd,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,KAAK,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;;;UAuFA"}
|
|
@@ -4,8 +4,8 @@ exports.loadSupergraphSdlFromStorage = exports.SUPERGRAPH_SDL_QUERY = void 0;
|
|
|
4
4
|
const apollo_server_env_1 = require("apollo-server-env");
|
|
5
5
|
const outOfBandReporter_1 = require("./outOfBandReporter");
|
|
6
6
|
exports.SUPERGRAPH_SDL_QUERY = `#graphql
|
|
7
|
-
query SupergraphSdl($apiKey: String!, $ref: String
|
|
8
|
-
routerConfig(ref: $ref, apiKey: $apiKey) {
|
|
7
|
+
query SupergraphSdl($apiKey: String!, $ref: String!, $ifAfterId: ID) {
|
|
8
|
+
routerConfig(ref: $ref, apiKey: $apiKey, ifAfterId: $ifAfterId) {
|
|
9
9
|
__typename
|
|
10
10
|
... on RouterConfigResult {
|
|
11
11
|
id
|
|
@@ -20,7 +20,7 @@ exports.SUPERGRAPH_SDL_QUERY = `#graphql
|
|
|
20
20
|
`;
|
|
21
21
|
const { name, version } = require('../package.json');
|
|
22
22
|
const fetchErrorMsg = "An error occurred while fetching your schema from Apollo: ";
|
|
23
|
-
async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetcher, }) {
|
|
23
|
+
async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetcher, compositionId, }) {
|
|
24
24
|
var _a, _b;
|
|
25
25
|
let result;
|
|
26
26
|
const requestDetails = {
|
|
@@ -30,6 +30,7 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetche
|
|
|
30
30
|
variables: {
|
|
31
31
|
ref: graphRef,
|
|
32
32
|
apiKey,
|
|
33
|
+
ifAfterId: compositionId,
|
|
33
34
|
},
|
|
34
35
|
}),
|
|
35
36
|
headers: {
|
|
@@ -89,6 +90,9 @@ async function loadSupergraphSdlFromStorage({ graphRef, apiKey, endpoint, fetche
|
|
|
89
90
|
const { code, message } = routerConfig;
|
|
90
91
|
throw new Error(`${code}: ${message}`);
|
|
91
92
|
}
|
|
93
|
+
else if (routerConfig.__typename === 'Unchanged') {
|
|
94
|
+
return null;
|
|
95
|
+
}
|
|
92
96
|
else {
|
|
93
97
|
throw new Error('Programming error: unhandled response failure');
|
|
94
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadSupergraphSdlFromStorage.js","sourceRoot":"","sources":["../src/loadSupergraphSdlFromStorage.ts"],"names":[],"mappings":";;;AAAA,yDAA6D;AAE7D,2DAAwD;AAI3C,QAAA,oBAAoB,GAAgB;;;;;;;;;;;;;;CAchD,CAAC;AAgBF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAErD,MAAM,aAAa,GAAG,4DAA4D,CAAC;AAE5E,KAAK,UAAU,4BAA4B,CAAC,EACjD,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,OAAO,
|
|
1
|
+
{"version":3,"file":"loadSupergraphSdlFromStorage.js","sourceRoot":"","sources":["../src/loadSupergraphSdlFromStorage.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@apollo/gateway",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.44.0",
|
|
4
4
|
"description": "Apollo Gateway",
|
|
5
5
|
"author": "Apollo <packages@apollographql.com>",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -25,8 +25,8 @@
|
|
|
25
25
|
"access": "public"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@apollo/core-schema": "^0.
|
|
29
|
-
"@apollo/federation": "^0.33.
|
|
28
|
+
"@apollo/core-schema": "^0.2.0",
|
|
29
|
+
"@apollo/federation": "^0.33.7",
|
|
30
30
|
"@apollo/query-planner": "^0.6.0",
|
|
31
31
|
"@opentelemetry/api": "^1.0.1",
|
|
32
32
|
"@types/node-fetch": "2.5.12",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"pretty-format": "^26.0.0"
|
|
43
43
|
},
|
|
44
44
|
"peerDependencies": {
|
|
45
|
-
"graphql": "^15.
|
|
45
|
+
"graphql": "^15.7.2"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "3bd7593933ca6e65550db27a58411777700c7664"
|
|
48
48
|
}
|
|
@@ -90,8 +90,8 @@ export type Query = {
|
|
|
90
90
|
|
|
91
91
|
export type QueryRouterConfigArgs = {
|
|
92
92
|
apiKey: Scalars['String'];
|
|
93
|
+
ifAfterId?: Maybe<Scalars['ID']>;
|
|
93
94
|
ref: Scalars['String'];
|
|
94
|
-
unlessIdIn?: Maybe<Array<Scalars['ID']>>;
|
|
95
95
|
};
|
|
96
96
|
|
|
97
97
|
export type Request = {
|
|
@@ -125,6 +125,7 @@ export type Unchanged = {
|
|
|
125
125
|
export type SupergraphSdlQueryVariables = Exact<{
|
|
126
126
|
apiKey: Scalars['String'];
|
|
127
127
|
ref: Scalars['String'];
|
|
128
|
+
ifAfterId?: Maybe<Scalars['ID']>;
|
|
128
129
|
}>;
|
|
129
130
|
|
|
130
131
|
|
|
@@ -13,6 +13,8 @@ import {
|
|
|
13
13
|
mockSupergraphSdlRequest,
|
|
14
14
|
mockApolloConfig,
|
|
15
15
|
mockCloudConfigUrl,
|
|
16
|
+
mockSupergraphSdlRequestIfAfter,
|
|
17
|
+
mockSupergraphSdlRequestSuccessIfAfter,
|
|
16
18
|
} from './nockMocks';
|
|
17
19
|
import {
|
|
18
20
|
accounts,
|
|
@@ -130,7 +132,11 @@ it('Fetches Supergraph SDL from remote storage using a configured env variable',
|
|
|
130
132
|
|
|
131
133
|
it('Updates Supergraph SDL from remote storage', async () => {
|
|
132
134
|
mockSupergraphSdlRequestSuccess();
|
|
133
|
-
|
|
135
|
+
mockSupergraphSdlRequestSuccessIfAfter(
|
|
136
|
+
'originalId-1234',
|
|
137
|
+
'updatedId-5678',
|
|
138
|
+
getTestingSupergraphSdl(fixturesWithUpdate),
|
|
139
|
+
);
|
|
134
140
|
|
|
135
141
|
// This test is only interested in the second time the gateway notifies of an
|
|
136
142
|
// update, since the first happens on load.
|
|
@@ -183,7 +189,7 @@ describe('Supergraph SDL update failures', () => {
|
|
|
183
189
|
|
|
184
190
|
it('Handles arbitrary fetch failures (non 200 response)', async () => {
|
|
185
191
|
mockSupergraphSdlRequestSuccess();
|
|
186
|
-
|
|
192
|
+
mockSupergraphSdlRequestIfAfter('originalId-1234').reply(500);
|
|
187
193
|
|
|
188
194
|
// Spy on logger.error so we can just await once it's been called
|
|
189
195
|
let errorLogged: Function;
|
|
@@ -208,7 +214,7 @@ describe('Supergraph SDL update failures', () => {
|
|
|
208
214
|
|
|
209
215
|
it('Handles GraphQL errors', async () => {
|
|
210
216
|
mockSupergraphSdlRequestSuccess();
|
|
211
|
-
mockSupergraphSdlRequest().reply(200, {
|
|
217
|
+
mockSupergraphSdlRequest('originalId-1234').reply(200, {
|
|
212
218
|
errors: [
|
|
213
219
|
{
|
|
214
220
|
message: 'Cannot query field "fail" on type "Query".',
|
|
@@ -242,7 +248,7 @@ describe('Supergraph SDL update failures', () => {
|
|
|
242
248
|
|
|
243
249
|
it("Doesn't update and logs on receiving unparseable Supergraph SDL", async () => {
|
|
244
250
|
mockSupergraphSdlRequestSuccess();
|
|
245
|
-
|
|
251
|
+
mockSupergraphSdlRequestIfAfter('originalId-1234').reply(
|
|
246
252
|
200,
|
|
247
253
|
JSON.stringify({
|
|
248
254
|
data: {
|
|
@@ -314,8 +320,12 @@ describe('Supergraph SDL update failures', () => {
|
|
|
314
320
|
it('Rollsback to a previous schema when triggered', async () => {
|
|
315
321
|
// Init
|
|
316
322
|
mockSupergraphSdlRequestSuccess();
|
|
317
|
-
|
|
318
|
-
|
|
323
|
+
mockSupergraphSdlRequestSuccessIfAfter(
|
|
324
|
+
'originalId-1234',
|
|
325
|
+
'updatedId-5678',
|
|
326
|
+
getTestingSupergraphSdl(fixturesWithUpdate),
|
|
327
|
+
);
|
|
328
|
+
mockSupergraphSdlRequestSuccessIfAfter('updatedId-5678');
|
|
319
329
|
|
|
320
330
|
let firstResolve: Function;
|
|
321
331
|
let secondResolve: Function;
|
|
@@ -480,9 +490,10 @@ describe('Downstream service health checks', () => {
|
|
|
480
490
|
mockAllServicesHealthCheckSuccess();
|
|
481
491
|
|
|
482
492
|
// Update
|
|
483
|
-
|
|
484
|
-
|
|
493
|
+
mockSupergraphSdlRequestSuccessIfAfter(
|
|
494
|
+
'originalId-1234',
|
|
485
495
|
'updatedId-5678',
|
|
496
|
+
getTestingSupergraphSdl(fixturesWithUpdate),
|
|
486
497
|
);
|
|
487
498
|
mockAllServicesHealthCheckSuccess();
|
|
488
499
|
|
|
@@ -523,9 +534,10 @@ describe('Downstream service health checks', () => {
|
|
|
523
534
|
mockAllServicesHealthCheckSuccess();
|
|
524
535
|
|
|
525
536
|
// Update (with one health check failure)
|
|
526
|
-
|
|
527
|
-
|
|
537
|
+
mockSupergraphSdlRequestSuccessIfAfter(
|
|
538
|
+
'originalId-1234',
|
|
528
539
|
'updatedId-5678',
|
|
540
|
+
getTestingSupergraphSdl(fixturesWithUpdate),
|
|
529
541
|
);
|
|
530
542
|
mockServiceHealthCheck(accounts).reply(500);
|
|
531
543
|
mockServiceHealthCheckSuccess(books);
|
|
@@ -70,21 +70,30 @@ export const mockCloudConfigUrl =
|
|
|
70
70
|
export const mockOutOfBandReporterUrl =
|
|
71
71
|
'https://example.outofbandreporter.com/monitoring/';
|
|
72
72
|
|
|
73
|
-
export function
|
|
73
|
+
export function mockSupergraphSdlRequestIfAfter(ifAfter: string | null) {
|
|
74
74
|
return gatewayNock(mockCloudConfigUrl).post('/', {
|
|
75
75
|
query: SUPERGRAPH_SDL_QUERY,
|
|
76
76
|
variables: {
|
|
77
77
|
ref: graphRef,
|
|
78
78
|
apiKey: apiKey,
|
|
79
|
+
ifAfterId: ifAfter,
|
|
79
80
|
},
|
|
80
81
|
});
|
|
81
82
|
}
|
|
82
83
|
|
|
83
|
-
export function
|
|
84
|
-
|
|
85
|
-
|
|
84
|
+
export function mockSupergraphSdlRequest(ifAfter: string | null = null) {
|
|
85
|
+
return mockSupergraphSdlRequestIfAfter(ifAfter);
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
export function mockSupergraphSdlRequestSuccessIfAfter(
|
|
89
|
+
ifAfter: string | null = null,
|
|
90
|
+
id: string = 'originalId-1234',
|
|
91
|
+
supergraphSdl: string = getTestingSupergraphSdl(),
|
|
86
92
|
) {
|
|
87
|
-
|
|
93
|
+
if (supergraphSdl == null) {
|
|
94
|
+
supergraphSdl = getTestingSupergraphSdl();
|
|
95
|
+
}
|
|
96
|
+
return mockSupergraphSdlRequestIfAfter(ifAfter).reply(
|
|
88
97
|
200,
|
|
89
98
|
JSON.stringify({
|
|
90
99
|
data: {
|
|
@@ -98,6 +107,25 @@ export function mockSupergraphSdlRequestSuccess(
|
|
|
98
107
|
);
|
|
99
108
|
}
|
|
100
109
|
|
|
110
|
+
export function mockSupergraphSdlRequestIfAfterUnchanged(
|
|
111
|
+
ifAfter: string | null = null,
|
|
112
|
+
) {
|
|
113
|
+
return mockSupergraphSdlRequestIfAfter(ifAfter).reply(
|
|
114
|
+
200,
|
|
115
|
+
JSON.stringify({
|
|
116
|
+
data: {
|
|
117
|
+
routerConfig: {
|
|
118
|
+
__typename: 'Unchanged',
|
|
119
|
+
},
|
|
120
|
+
},
|
|
121
|
+
}),
|
|
122
|
+
);
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
export function mockSupergraphSdlRequestSuccess() {
|
|
126
|
+
return mockSupergraphSdlRequestSuccessIfAfter(null);
|
|
127
|
+
}
|
|
128
|
+
|
|
101
129
|
export function mockOutOfBandReportRequest() {
|
|
102
130
|
return gatewayNock(mockOutOfBandReporterUrl).post('/', () => true);
|
|
103
131
|
}
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
mockOutOfBandReporterUrl,
|
|
9
9
|
mockOutOfBandReportRequestSuccess,
|
|
10
10
|
mockSupergraphSdlRequestSuccess,
|
|
11
|
+
mockSupergraphSdlRequestIfAfterUnchanged,
|
|
11
12
|
} from './integration/nockMocks';
|
|
12
13
|
import mockedEnv from 'mocked-env';
|
|
13
14
|
|
|
@@ -30,6 +31,8 @@ describe('loadSupergraphSdlFromStorage', () => {
|
|
|
30
31
|
apiKey,
|
|
31
32
|
endpoint: mockCloudConfigUrl,
|
|
32
33
|
fetcher,
|
|
34
|
+
compositionId: null,
|
|
35
|
+
|
|
33
36
|
});
|
|
34
37
|
|
|
35
38
|
expect(result).toMatchInlineSnapshot(`
|
|
@@ -358,6 +361,8 @@ describe('loadSupergraphSdlFromStorage', () => {
|
|
|
358
361
|
apiKey,
|
|
359
362
|
endpoint: mockCloudConfigUrl,
|
|
360
363
|
fetcher,
|
|
364
|
+
compositionId: null,
|
|
365
|
+
|
|
361
366
|
}),
|
|
362
367
|
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
363
368
|
`"An error occurred while fetching your schema from Apollo: 200 invalid json response body at https://example.cloud-config-url.com/cloudconfig/ reason: Unexpected token I in JSON at position 0"`,
|
|
@@ -380,6 +385,7 @@ describe('loadSupergraphSdlFromStorage', () => {
|
|
|
380
385
|
apiKey,
|
|
381
386
|
endpoint: mockCloudConfigUrl,
|
|
382
387
|
fetcher,
|
|
388
|
+
compositionId: null,
|
|
383
389
|
}),
|
|
384
390
|
).rejects.toThrowError(message);
|
|
385
391
|
});
|
|
@@ -394,6 +400,7 @@ describe('loadSupergraphSdlFromStorage', () => {
|
|
|
394
400
|
apiKey,
|
|
395
401
|
endpoint: mockCloudConfigUrl,
|
|
396
402
|
fetcher,
|
|
403
|
+
compositionId: null,
|
|
397
404
|
}),
|
|
398
405
|
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
399
406
|
`"An error occurred while fetching your schema from Apollo: 500 Internal Server Error"`,
|
|
@@ -412,6 +419,7 @@ describe('loadSupergraphSdlFromStorage', () => {
|
|
|
412
419
|
apiKey,
|
|
413
420
|
endpoint: mockCloudConfigUrl,
|
|
414
421
|
fetcher,
|
|
422
|
+
compositionId: null,
|
|
415
423
|
}),
|
|
416
424
|
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
417
425
|
`"An error occurred while fetching your schema from Apollo: 400 invalid json response body at https://example.cloud-config-url.com/cloudconfig/ reason: Unexpected end of JSON input"`,
|
|
@@ -433,6 +441,7 @@ describe('loadSupergraphSdlFromStorage', () => {
|
|
|
433
441
|
apiKey,
|
|
434
442
|
endpoint: mockCloudConfigUrl,
|
|
435
443
|
fetcher,
|
|
444
|
+
compositionId: null,
|
|
436
445
|
}),
|
|
437
446
|
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
438
447
|
`"An error occurred while fetching your schema from Apollo: 400 invalid json response body at https://example.cloud-config-url.com/cloudconfig/ reason: Unexpected end of JSON input"`,
|
|
@@ -454,6 +463,7 @@ describe('loadSupergraphSdlFromStorage', () => {
|
|
|
454
463
|
apiKey,
|
|
455
464
|
endpoint: mockCloudConfigUrl,
|
|
456
465
|
fetcher,
|
|
466
|
+
compositionId: null,
|
|
457
467
|
}),
|
|
458
468
|
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
459
469
|
`"An error occurred while fetching your schema from Apollo: 413 Payload Too Large"`,
|
|
@@ -475,6 +485,7 @@ describe('loadSupergraphSdlFromStorage', () => {
|
|
|
475
485
|
apiKey,
|
|
476
486
|
endpoint: mockCloudConfigUrl,
|
|
477
487
|
fetcher,
|
|
488
|
+
compositionId: null,
|
|
478
489
|
}),
|
|
479
490
|
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
480
491
|
`"An error occurred while fetching your schema from Apollo: 422 Unprocessable Entity"`,
|
|
@@ -496,6 +507,7 @@ describe('loadSupergraphSdlFromStorage', () => {
|
|
|
496
507
|
apiKey,
|
|
497
508
|
endpoint: mockCloudConfigUrl,
|
|
498
509
|
fetcher,
|
|
510
|
+
compositionId: null,
|
|
499
511
|
}),
|
|
500
512
|
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
501
513
|
`"An error occurred while fetching your schema from Apollo: 408 Request Timeout"`,
|
|
@@ -518,6 +530,7 @@ describe('loadSupergraphSdlFromStorage', () => {
|
|
|
518
530
|
apiKey,
|
|
519
531
|
endpoint: mockCloudConfigUrl,
|
|
520
532
|
fetcher,
|
|
533
|
+
compositionId: null,
|
|
521
534
|
}),
|
|
522
535
|
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
523
536
|
`"An error occurred while fetching your schema from Apollo: 504 Gateway Timeout"`,
|
|
@@ -539,6 +552,7 @@ describe('loadSupergraphSdlFromStorage', () => {
|
|
|
539
552
|
apiKey,
|
|
540
553
|
endpoint: mockCloudConfigUrl,
|
|
541
554
|
fetcher,
|
|
555
|
+
compositionId: null,
|
|
542
556
|
}),
|
|
543
557
|
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
544
558
|
`"An error occurred while fetching your schema from Apollo: request to https://example.cloud-config-url.com/cloudconfig/ failed, reason: no response"`,
|
|
@@ -560,6 +574,7 @@ describe('loadSupergraphSdlFromStorage', () => {
|
|
|
560
574
|
apiKey,
|
|
561
575
|
endpoint: mockCloudConfigUrl,
|
|
562
576
|
fetcher,
|
|
577
|
+
compositionId: null,
|
|
563
578
|
}),
|
|
564
579
|
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
565
580
|
`"An error occurred while fetching your schema from Apollo: 502 Bad Gateway"`,
|
|
@@ -581,9 +596,24 @@ describe('loadSupergraphSdlFromStorage', () => {
|
|
|
581
596
|
apiKey,
|
|
582
597
|
endpoint: mockCloudConfigUrl,
|
|
583
598
|
fetcher,
|
|
599
|
+
compositionId: null,
|
|
584
600
|
}),
|
|
585
601
|
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
586
602
|
`"An error occurred while fetching your schema from Apollo: 503 Service Unavailable"`,
|
|
587
603
|
);
|
|
588
604
|
});
|
|
605
|
+
|
|
606
|
+
it('successfully responds to SDL unchanged by returning null', async () => {
|
|
607
|
+
mockSupergraphSdlRequestIfAfterUnchanged("id-1234");
|
|
608
|
+
|
|
609
|
+
const fetcher = getDefaultFetcher();
|
|
610
|
+
const result = await loadSupergraphSdlFromStorage({
|
|
611
|
+
graphRef,
|
|
612
|
+
apiKey,
|
|
613
|
+
endpoint: mockCloudConfigUrl,
|
|
614
|
+
fetcher,
|
|
615
|
+
compositionId: "id-1234",
|
|
616
|
+
});
|
|
617
|
+
expect(result).toBeNull();
|
|
618
|
+
});
|
|
589
619
|
});
|
package/src/index.ts
CHANGED
|
@@ -193,6 +193,7 @@ export class ApolloGateway implements GraphQLService {
|
|
|
193
193
|
private serviceSdlCache = new Map<string, string>();
|
|
194
194
|
private warnedStates: WarnedStates = Object.create(null);
|
|
195
195
|
private queryPlanner?: QueryPlanner;
|
|
196
|
+
private supergraphSdl?: string;
|
|
196
197
|
private parsedSupergraphSdl?: DocumentNode;
|
|
197
198
|
private fetcher: typeof fetch;
|
|
198
199
|
private compositionId?: string;
|
|
@@ -447,6 +448,7 @@ export class ApolloGateway implements GraphQLService {
|
|
|
447
448
|
: this.createSchemaFromSupergraphSdl(config.supergraphSdl));
|
|
448
449
|
// TODO(trevor): #580 redundant parse
|
|
449
450
|
this.parsedSupergraphSdl = parse(supergraphSdl);
|
|
451
|
+
this.supergraphSdl = supergraphSdl;
|
|
450
452
|
this.updateWithSchemaAndNotify(schema, supergraphSdl, true);
|
|
451
453
|
} catch (e) {
|
|
452
454
|
this.state = { phase: 'failed to load' };
|
|
@@ -576,6 +578,7 @@ export class ApolloGateway implements GraphQLService {
|
|
|
576
578
|
await this.maybePerformServiceHealthCheck(result);
|
|
577
579
|
|
|
578
580
|
this.compositionId = result.id;
|
|
581
|
+
this.supergraphSdl = result.supergraphSdl;
|
|
579
582
|
this.parsedSupergraphSdl = parsedSupergraphSdl;
|
|
580
583
|
|
|
581
584
|
const { schema, supergraphSdl } = this.createSchemaFromSupergraphSdl(
|
|
@@ -979,12 +982,18 @@ export class ApolloGateway implements GraphQLService {
|
|
|
979
982
|
|
|
980
983
|
// TODO(trevor:cloudconfig): This condition goes away completely
|
|
981
984
|
if (isPrecomposedManagedConfig(config)) {
|
|
982
|
-
|
|
985
|
+
const result = await loadSupergraphSdlFromStorage({
|
|
983
986
|
graphRef: this.apolloConfig!.graphRef!,
|
|
984
987
|
apiKey: this.apolloConfig!.key!,
|
|
985
988
|
endpoint: this.schemaConfigDeliveryEndpoint!,
|
|
986
989
|
fetcher: this.fetcher,
|
|
990
|
+
compositionId: this.compositionId ?? null,
|
|
987
991
|
});
|
|
992
|
+
|
|
993
|
+
return result ?? {
|
|
994
|
+
id: this.compositionId!,
|
|
995
|
+
supergraphSdl: this.supergraphSdl!,
|
|
996
|
+
}
|
|
988
997
|
} else if (isLegacyManagedConfig(config)) {
|
|
989
998
|
return getServiceDefinitionsFromStorage({
|
|
990
999
|
graphRef: this.apolloConfig!.graphRef!,
|
|
@@ -5,8 +5,8 @@ import { SupergraphSdlQuery } from './__generated__/graphqlTypes';
|
|
|
5
5
|
|
|
6
6
|
// Magic /* GraphQL */ comment below is for codegen, do not remove
|
|
7
7
|
export const SUPERGRAPH_SDL_QUERY = /* GraphQL */`#graphql
|
|
8
|
-
query SupergraphSdl($apiKey: String!, $ref: String
|
|
9
|
-
routerConfig(ref: $ref, apiKey: $apiKey) {
|
|
8
|
+
query SupergraphSdl($apiKey: String!, $ref: String!, $ifAfterId: ID) {
|
|
9
|
+
routerConfig(ref: $ref, apiKey: $apiKey, ifAfterId: $ifAfterId) {
|
|
10
10
|
__typename
|
|
11
11
|
... on RouterConfigResult {
|
|
12
12
|
id
|
|
@@ -43,11 +43,13 @@ export async function loadSupergraphSdlFromStorage({
|
|
|
43
43
|
apiKey,
|
|
44
44
|
endpoint,
|
|
45
45
|
fetcher,
|
|
46
|
+
compositionId,
|
|
46
47
|
}: {
|
|
47
48
|
graphRef: string;
|
|
48
49
|
apiKey: string;
|
|
49
50
|
endpoint: string;
|
|
50
51
|
fetcher: typeof fetch;
|
|
52
|
+
compositionId: string | null;
|
|
51
53
|
}) {
|
|
52
54
|
let result: Response;
|
|
53
55
|
const requestDetails = {
|
|
@@ -57,6 +59,7 @@ export async function loadSupergraphSdlFromStorage({
|
|
|
57
59
|
variables: {
|
|
58
60
|
ref: graphRef,
|
|
59
61
|
apiKey,
|
|
62
|
+
ifAfterId: compositionId,
|
|
60
63
|
},
|
|
61
64
|
}),
|
|
62
65
|
headers: {
|
|
@@ -124,13 +127,13 @@ export async function loadSupergraphSdlFromStorage({
|
|
|
124
127
|
supergraphSdl,
|
|
125
128
|
// messages,
|
|
126
129
|
} = routerConfig;
|
|
127
|
-
|
|
128
|
-
// `supergraphSdl` should not be nullable in the schema, but it currently is
|
|
129
130
|
return { id, supergraphSdl: supergraphSdl! };
|
|
130
131
|
} else if (routerConfig.__typename === 'FetchError') {
|
|
131
132
|
// FetchError case
|
|
132
133
|
const { code, message } = routerConfig;
|
|
133
134
|
throw new Error(`${code}: ${message}`);
|
|
135
|
+
} else if (routerConfig.__typename === 'Unchanged') {
|
|
136
|
+
return null;
|
|
134
137
|
} else {
|
|
135
138
|
throw new Error('Programming error: unhandled response failure');
|
|
136
139
|
}
|