From c48527b44f695accd95754c54d19be8faa308ed5 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Wed, 23 Mar 2022 16:34:43 +0200
Subject: [PATCH] Fix winston logger missing splat format (#5070)

---
 src/common/logger.ts                         | 5 ++++-
 src/main/__test__/cluster.test.ts            | 1 +
 src/main/__test__/kube-auth-proxy.test.ts    | 1 +
 src/main/__test__/kubeconfig-manager.test.ts | 1 +
 src/main/app-updater.ts                      | 8 ++++----
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/common/logger.ts b/src/common/logger.ts
index 504b0e126d..f29008818b 100644
--- a/src/common/logger.ts
+++ b/src/common/logger.ts
@@ -65,6 +65,9 @@ if (ipcMain) {
 }
 
 export default winston.createLogger({
-  format: format.simple(),
+  format: format.combine(
+    format.splat(),
+    format.simple(),
+  ),
   transports,
 });
diff --git a/src/main/__test__/cluster.test.ts b/src/main/__test__/cluster.test.ts
index 2b6ab2eb8b..d570919f3e 100644
--- a/src/main/__test__/cluster.test.ts
+++ b/src/main/__test__/cluster.test.ts
@@ -20,6 +20,7 @@ jest.mock("winston", () => ({
     label: jest.fn(),
     timestamp: jest.fn(),
     printf: jest.fn(),
+    splat: jest.fn(),
   },
   createLogger: jest.fn().mockReturnValue(logger),
   transports: {
diff --git a/src/main/__test__/kube-auth-proxy.test.ts b/src/main/__test__/kube-auth-proxy.test.ts
index 162cf823ee..497ccfaa53 100644
--- a/src/main/__test__/kube-auth-proxy.test.ts
+++ b/src/main/__test__/kube-auth-proxy.test.ts
@@ -15,6 +15,7 @@ jest.mock("winston", () => ({
     printf: jest.fn(),
     padLevels: jest.fn(),
     ms: jest.fn(),
+    splat: jest.fn(),
   },
   createLogger: jest.fn().mockReturnValue({
     silly: jest.fn(),
diff --git a/src/main/__test__/kubeconfig-manager.test.ts b/src/main/__test__/kubeconfig-manager.test.ts
index 263d6be996..91792bfaf8 100644
--- a/src/main/__test__/kubeconfig-manager.test.ts
+++ b/src/main/__test__/kubeconfig-manager.test.ts
@@ -21,6 +21,7 @@ jest.mock("winston", () => ({
     padLevels: jest.fn(),
     ms: jest.fn(),
     printf: jest.fn(),
+    splat: jest.fn(),
   },
   createLogger: jest.fn().mockReturnValue(logger),
   transports: {
diff --git a/src/main/app-updater.ts b/src/main/app-updater.ts
index e63da9453e..b30d799677 100644
--- a/src/main/app-updater.ts
+++ b/src/main/app-updater.ts
@@ -52,10 +52,10 @@ function handleAutoUpdateBackChannel(event: Electron.IpcMainEvent, ...[arg]: Upd
 }
 
 autoUpdater.logger = {
-  info: message => logger.info(`[AUTO-UPDATE]: electron-updater:`, message),
-  warn: message => logger.warn(`[AUTO-UPDATE]: electron-updater:`, message),
-  error: message => logger.error(`[AUTO-UPDATE]: electron-updater:`, message),
-  debug: message => logger.debug(`[AUTO-UPDATE]: electron-updater:`, message),
+  info: message => logger.info(`[AUTO-UPDATE]: electron-updater: %s`, message),
+  warn: message => logger.warn(`[AUTO-UPDATE]: electron-updater: %s`, message),
+  error: message => logger.error(`[AUTO-UPDATE]: electron-updater: %s`, message),
+  debug: message => logger.debug(`[AUTO-UPDATE]: electron-updater: %s`, message),
 };
 
 /**