fix: restore allow setting engine: false to ignore env var
#2850
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
glasser
reviewed
Jun 14, 2019
| @@ -87,7 +87,8 @@ function getEngineApiKey(engine: Config['engine']): string | undefined { | |||
|
|
|||
| function getEngineServiceId(engine: Config['engine']): string | undefined { | |||
| const engineApiKey = getEngineApiKey(engine); | |||
| if (engineApiKey) { | |||
|
|
|||
| if (engine !== false && engineApiKey) { | |||
There was a problem hiding this comment.
Seems like this logic should be in getEngineApiKey?
cheapsteak
force-pushed
the
chang/fix/restore-engine-false-no-env
branch
3 times, most recently
from
2e60f4f to
c91f835
Compare
glasser
approved these changes
Jun 21, 2019
glasser
reviewed
Jun 21, 2019
CHANGELOG.md
Outdated
| @@ -10,6 +10,7 @@ | |||
| - `apollo-federation`: Deduplicate variable definitions for subqueries [PR #2840](https://github.com/apollographql/apollo-server/pull/2840) | |||
| - `apollo-federation`: Preserve docstrings in SDL of federated services. [PR #2830](https://github.com/apollographql/apollo-server/pull/2830) | |||
| - `apollo-engine-reporting`: Set `forbiddenOperation` and `registeredOperation` later in the request lifecycle [PR #2828](https://github.com/apollographql/apollo-server/pull/2828) | |||
| - `apollo-server-core`: Bug fix: Setting `engine: false` should ignore `ENGINE_API_KEY` in environment variable [PR #2850](https://github.com/apollographql/apollo-server/pull/2850) | |||
There was a problem hiding this comment.
although the changelog should note that this was a regression introduced in 2.6.0
There was a problem hiding this comment.
ah, good idea, will add!
cheapsteak
force-pushed
the
chang/fix/restore-engine-false-no-env
branch
from
c046802 to
639476a
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Followup to fix unintended side effect of #2685 that David discovered where setting
engine: falsewould no longer ignore theENGINE_API_KEYenvironment variable