From 031b1d8b3902dbfce8be4321c2804ddd58c33e65 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 20 Jun 2020 21:14:26 +0200
Subject: [PATCH] auth-backend: remove logging from DatabaseKeyStore

---
 .../src/identity/DatabaseKeyStore.test.ts             |  7 ++-----
 plugins/auth-backend/src/identity/DatabaseKeyStore.ts | 11 +----------
 plugins/auth-backend/src/service/router.ts            |  1 -
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/plugins/auth-backend/src/identity/DatabaseKeyStore.test.ts b/plugins/auth-backend/src/identity/DatabaseKeyStore.test.ts
index 3badd90c2f..b22ab0ecda 100644
--- a/plugins/auth-backend/src/identity/DatabaseKeyStore.test.ts
+++ b/plugins/auth-backend/src/identity/DatabaseKeyStore.test.ts
@@ -17,7 +17,6 @@
 import Knex from 'knex';
 import moment from 'moment';
 import { DatabaseKeyStore } from './DatabaseKeyStore';
-import { getVoidLogger } from '@backstage/backend-common';
 
 function createDB() {
   const knex = Knex({
@@ -37,12 +36,10 @@ const keyBase = {
   alg: 'Base64',
 } as const;
 
-const logger = getVoidLogger();
-
 describe('DatabaseKeyStore', () => {
   it('should store a key', async () => {
     const database = createDB();
-    const store = await DatabaseKeyStore.create({ database, logger });
+    const store = await DatabaseKeyStore.create({ database });
 
     const key = {
       kid: '123',
@@ -59,7 +56,7 @@ describe('DatabaseKeyStore', () => {
 
   it('should remove stored keys', async () => {
     const database = createDB();
-    const store = await DatabaseKeyStore.create({ database, logger });
+    const store = await DatabaseKeyStore.create({ database });
 
     const key1 = { kid: '1', ...keyBase };
     const key2 = { kid: '2', ...keyBase };
diff --git a/plugins/auth-backend/src/identity/DatabaseKeyStore.ts b/plugins/auth-backend/src/identity/DatabaseKeyStore.ts
index 18e947a378..c175cd6e12 100644
--- a/plugins/auth-backend/src/identity/DatabaseKeyStore.ts
+++ b/plugins/auth-backend/src/identity/DatabaseKeyStore.ts
@@ -17,7 +17,6 @@
 import Knex from 'knex';
 import path from 'path';
 import { utc } from 'moment';
-import { Logger } from 'winston';
 import { AnyJWK, KeyStore, StoredKey } from './types';
 
 const migrationsDir = path.resolve(
@@ -34,7 +33,6 @@ type Row = {
 };
 
 type Options = {
-  logger: Logger;
   database: Knex;
 };
 
@@ -49,12 +47,10 @@ export class DatabaseKeyStore implements KeyStore {
     return new DatabaseKeyStore(options);
   }
 
-  private readonly logger: Logger;
   private readonly database: Knex;
 
   private constructor(options: Options) {
     this.database = options.database;
-    this.logger = options.logger;
   }
 
   async addKey(key: AnyJWK): Promise<void> {
@@ -76,11 +72,6 @@ export class DatabaseKeyStore implements KeyStore {
   }
 
   async removeKeys(kids: string[]): Promise<void> {
-    const result = await this.database(TABLE).delete().whereIn('kid', kids);
-    if (result !== kids.length) {
-      this.logger.warn(
-        `Wanted to remove ${kids.length} keys, but only removed ${result}`,
-      );
-    }
+    await this.database(TABLE).delete().whereIn('kid', kids);
   }
 }
diff --git a/plugins/auth-backend/src/service/router.ts b/plugins/auth-backend/src/service/router.ts
index 505b870b50..3787458f9b 100644
--- a/plugins/auth-backend/src/service/router.ts
+++ b/plugins/auth-backend/src/service/router.ts
@@ -41,7 +41,6 @@ export async function createRouter(
 
   const keyStore = await DatabaseKeyStore.create({
     database: options.database,
-    logger: logger.child({ component: 'db-key-store' }),
   });
   const tokenIssuer = new TokenFactory({
     issuer: baseUrl,