fix(op-reg): Switch to apollo-server-types Logger type.

apollographql · Jun 27, 2020 · f3fbe15 · f3fbe15
1 parent a6fc182
commit f3fbe15
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts b/packages/apollo-server-plugin-operation-registry/src/__tests__/agent.test.ts
@@ -19,6 +19,7 @@ import {
 import Agent, { AgentOptions } from "../agent";
 import { Operation } from "../ApolloServerPluginOperationRegistry";
 import { fakeTestBaseUrl, getLegacyOperationManifestUrl, getStoreKey, getOperationManifestUrl, urlOperationManifestBase } from "../common";
+import { Logger } from "apollo-server-types";
 
 // These get a bit verbose within the tests below, so we use this as a
 // sample store to pick and grab from.
@@ -147,7 +148,7 @@ describe('Agent', () => {
           sampleManifestRecords.c,
         ]);
         const relevantLogs: any = [];
-        const logger = {
+        const logger: Logger = {
           debug: jest.fn().mockImplementation((...args: any[]) => {
             if (
               typeof args[0] === 'string' &&
@@ -166,6 +167,8 @@ describe('Agent', () => {
               relevantLogs.push(args);
             }
           }),
+          info: () => {},
+          error: () => {},
         };
         await createAgent({ logger }).start();
 
@@ -198,8 +201,6 @@ describe('Agent', () => {
         );
 
         expect(relevantLogs.length).toBe(5);
-
-        logger.debug.mockRestore();
       });
 
       it('populates the manifest store after starting', async () => {

diff --git a/packages/apollo-server-plugin-operation-registry/src/agent.ts b/packages/apollo-server-plugin-operation-registry/src/agent.ts
@@ -13,12 +13,13 @@ import { Response } from 'node-fetch';
 import { InMemoryLRUCache } from 'apollo-server-caching';
 import { fetchIfNoneMatch } from './fetchIfNoneMatch';
 import { OperationManifest } from "./ApolloServerPluginOperationRegistry";
+import { Logger } from "apollo-server-types";
 
 const DEFAULT_POLL_SECONDS: number = 30;
 const SYNC_WARN_TIME_SECONDS: number = 60;
 
 export interface AgentOptions {
-  logger?: loglevel.Logger;
+  logger?: Logger;
   pollSeconds?: number;
   schemaHash: string;
   engine: any;
@@ -32,7 +33,7 @@ const callToAction = `Ensure this server's schema has been published with 'apoll
 
 export default class Agent {
   private timer?: NodeJS.Timer;
-  private logger: loglevel.Logger;
+  private logger: Logger;
   private hashedServiceId?: string;
   private requestInFlight: Promise<any> | null = null;
   private lastSuccessfulCheck?: Date;