Update both keys set to warn

If both APOLLO_KEY and ENGINE_API_KEY are set, this will now warn and
prefer APOLLO_KEY, in accordance with changes to apollo-tooling. Imp
personally not very opinionated on this front, so happy to take
direction from the reviewer.

Author: Adam Zionts

packages/apollo-engine-reporting/src/agent.ts

@@ -47,18 +47,20 @@ export type GenerateClientInfo<TContext> = (
   requestContext: GraphQLRequestContext<TContext>,
 ) => ClientInfo;
 
-export function getEngineApiKey(engine: EngineReportingOptions<any> | boolean | undefined) {
-  if (typeof engine === 'object' && engine.apiKey) {
-    return engine.apiKey;
+export function getEngineApiKey(engine: EngineReportingOptions<any> | boolean | undefined, skipWarn: boolean = false) {
+  if (typeof engine === 'object') {
+    if (engine.apiKey) {
+      return engine.apiKey;
+    }
   }
   const legacyApiKeyFromEnv = process.env.ENGINE_API_KEY;
   const apiKeyFromEnv = process.env.APOLLO_KEY;
 
-  if(legacyApiKeyFromEnv && apiKeyFromEnv) {
-    throw new Error(`Cannot set both APOLLO_KEY and ENGINE_API_KEY. Please only set APOLLO_KEY.`);
+  if(legacyApiKeyFromEnv && apiKeyFromEnv && !skipWarn) {
+    console.warn(`Both ENGINE_API_KEY (deprecated) and APOLLO_KEY are set; defaulting to APOLLO_KEY.`);
   }
-  if(legacyApiKeyFromEnv && !warnedOnDeprecatedApiKey) {
-    console.warn(`[Deprecation warning] Setting the key via ENGINE_API_KEY is deprecated and will not be supported in future versions.`);
+  if(legacyApiKeyFromEnv && !warnedOnDeprecatedApiKey && !skipWarn) {
+    console.warn(`[deprecated] Setting the key via ENGINE_API_KEY is deprecated and will not be supported in future versions.`);
     warnedOnDeprecatedApiKey = true;
   }
   return  apiKeyFromEnv || legacyApiKeyFromEnv || ''

packages/apollo-server-core/src/ApolloServer.ts

@@ -90,7 +90,7 @@ function getEngineGraphVariant(engine: Config['engine']): string | undefined {
     return engine.graphVariant || engine.schemaTag;
   } else {
     if (process.env.ENGINE_SCHEMA_TAG) {
-      console.warn('[Deprecation warning] Usage of ENGINE_SCHEMA_TAG is deprecated. Please use APOLLO_GRAPH_VARIANT instead.');
+      console.warn('[deprecated] Usage of ENGINE_SCHEMA_TAG is deprecated. Please use APOLLO_GRAPH_VARIANT instead.');
     }
     if (process.env.ENGINE_SCHEMA_TAG && process.env.APOLLO_GRAPH_VARIANT) {
       throw new Error('Cannot set both ENGINE_SCHEMA_TAG and APOLLO_GRAPH_VARIANT. Please use APOLLO_GRAPH_VARIANT.')
@@ -100,7 +100,7 @@ function getEngineGraphVariant(engine: Config['engine']): string | undefined {
 }
 
 function getEngineServiceId(engine: Config['engine']): string | undefined {
-  const engineApiKey = getEngineApiKey(engine);
+  const engineApiKey = getEngineApiKey(engine, true);
   if (engineApiKey) {
     return engineApiKey.split(':', 2)[1];
   }
@@ -304,7 +304,7 @@ export class ApolloServerBase {
     // The truthyness of this value can also be used in other forks of logic
     // related to Engine, as is the case with EngineReportingAgent just below.
     this.engineServiceId = getEngineServiceId(engine);
-    const apiKey = getEngineApiKey(engine);
+    const apiKey = getEngineApiKey(engine, true);
     if (apiKey) {
       this.engineApiKeyHash = createSHA('sha512')
         .update(apiKey)
@@ -314,7 +314,7 @@ export class ApolloServerBase {
     if (this.engineServiceId) {
       const { EngineReportingAgent } = require('apollo-engine-reporting');
       this.engineReportingAgent = new EngineReportingAgent(
-        typeof engine === 'object' ? engine : Object.create(null),
+        typeof engine === 'object' ? engine : Object.create(null)
       );
       // Don't add the extension here (we want to add it later in generateSchemaDerivedData).
     }

packages/apollo-server-core/src/__tests__/ApolloServerBase.test.ts

@@ -69,21 +69,29 @@ describe('environment variables', () => {
     const spyConsoleWarn = jest.spyOn(console, 'warn').mockImplementation();
 
     const server = new ApolloServerBase({
-      schema: buildServiceDefinition([{ typeDefs, resolvers }]).schema,
+      typeDefs,
+      resolvers
     });
 
     await server.stop();
     expect(spyConsoleWarn).toHaveBeenCalledTimes(1);
     spyConsoleWarn.mockReset();
   });
 
-  it('throws an error with both the legacy env var and new env var set', async () => {
+  it('warns with both the legacy env var and new env var set', async () => {
     // set the variables
     process.env.ENGINE_API_KEY = 'just:fake:stuff';
     process.env.APOLLO_KEY = 'also:fake:stuff';
+    const spyConsoleWarn = jest.spyOn(console, 'warn').mockImplementation();
+
+    const server = new ApolloServerBase({
+      typeDefs,
+      resolvers
+    });
 
-    expect( () => new ApolloServerBase({
-      schema: buildServiceDefinition([{ typeDefs, resolvers }]).schema,
-    })).toThrow();
+    await server.stop();
+    // Once for deprecation, once for double-set
+    expect(spyConsoleWarn).toHaveBeenCalledTimes(2);
+    spyConsoleWarn.mockReset();
   });
 });