diff --git a/CHANGELOG.md b/CHANGELOG.md index 70094734058..0483a83c058 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,6 @@ The version headers in this history reflect the versions of Apollo Server itself ## v2.25.0 - `apollo-server-core`: You may now specify your Studio graph as a graph ref (`id@variant`) via the `APOLLO_GRAPH_REF` environment variable or `new ApolloServer({apollo: {graphRef}})` instead of specifying graph ID and graph variant separately. The `apollo` object passed to plugin `serverWillStart` and to gateway `load` now contains a `graphRef` field. -- `apollo-server-core`: If you specify an Apollo key but do not specify a graph ID or graph ref, a deprecation warning is logged. The behavior where your graph ID can be inferred from the structure of your API key will be removed in Apollo Server 3. - `apollo-server-core`: Fix a race condition where schema reporting could lead to a delay at process shutdown. [PR #5222](https://github.com/apollographql/apollo-server/pull/5222) - `apollo-server-core`: Allow the Fetch API implementation to be overridden for the schema reporting and usage reporting plugins via a new `fetcher` option. [PR #5179](https://github.com/apollographql/apollo-server/pull/5179) - `apollo-server-core`: The `server.executeOperation` method (designed for testing) can now take its `query` as a `DocumentNode` (eg, a `gql`-tagged string) in addition to as a string. (This matches the behavior of the `apollo-server-testing` `createTestClient` function which is now deprecated.) We now recommend this method instead of `apollo-server-testing` in our docs. [Issue #4952](https://github.com/apollographql/apollo-server/issues/4952) diff --git a/packages/apollo-server-core/src/determineApolloConfig.ts b/packages/apollo-server-core/src/determineApolloConfig.ts index af3f3886210..4d8ec3ea2c3 100644 --- a/packages/apollo-server-core/src/determineApolloConfig.ts +++ b/packages/apollo-server-core/src/determineApolloConfig.ts @@ -128,7 +128,6 @@ export function determineApolloConfig( apolloConfig.graphVariant = apolloConfig.graphRef.substring(at + 1); } } else { - let usedKeyParser = false; // Graph ref not specified. Let's try harder to get ID/variant, then join them. if (!apolloConfig.graphId && apolloConfig.key) { // If the given key is a graph token (starts with 'service:'), then use the @@ -136,7 +135,6 @@ export function determineApolloConfig( const parts = apolloConfig.key.split(':', 2); if (parts[0] === 'service') { apolloConfig.graphId = parts[1]; - usedKeyParser = true; } else { throw Error( 'You have specified an API key in `apollo.key` or `APOLLO_KEY`, ' + @@ -152,13 +150,6 @@ export function determineApolloConfig( if (apolloConfig.graphId) { apolloConfig.graphRef = `${apolloConfig.graphId}@${apolloConfig.graphVariant}`; - if (usedKeyParser) { - logger.warn( - 'Deprecation warning: Setting your graph ref based on parsing your API key. ' + - 'API key parsing will be removed in Apollo Server 3. To be compatible with ' + - `Apollo Server 3, set \`APOLLO_GRAPH_REF\` to '${apolloConfig.graphRef}'.`, - ); - } } }