From 846236452c914b243cbd22c2ff3e5a121dbbb5d2 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Wed, 30 Nov 2022 16:02:27 -0500
Subject: [PATCH] Remove dead code

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/common/cluster-store/migration-token.ts   |  2 +-
 .../3.6.0-beta.1.injectable.ts                | 11 ++---
 src/migrations/helpers.ts                     | 41 -------------------
 3 files changed, 7 insertions(+), 47 deletions(-)
 delete mode 100644 src/migrations/helpers.ts

diff --git a/src/common/cluster-store/migration-token.ts b/src/common/cluster-store/migration-token.ts
index fda4ec751e..86489509a2 100644
--- a/src/common/cluster-store/migration-token.ts
+++ b/src/common/cluster-store/migration-token.ts
@@ -4,7 +4,7 @@
  */
 
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { MigrationDeclaration } from "../../migrations/helpers";
+import type { MigrationDeclaration } from "../base-store/migrations.injectable";
 
 export const clusterStoreMigrationInjectionToken = getInjectionToken<MigrationDeclaration>({
   id: "cluster-store-migration",
diff --git a/src/main/cluster/store-migrations/3.6.0-beta.1.injectable.ts b/src/main/cluster/store-migrations/3.6.0-beta.1.injectable.ts
index 49837f8c34..41eb645d11 100644
--- a/src/main/cluster/store-migrations/3.6.0-beta.1.injectable.ts
+++ b/src/main/cluster/store-migrations/3.6.0-beta.1.injectable.ts
@@ -13,7 +13,6 @@ import type { ClusterModel } from "../../../common/cluster-types";
 import readFileSyncInjectable from "../../../common/fs/read-file-sync.injectable";
 import { loadConfigFromString } from "../../../common/kube-helpers";
 import joinPathsInjectable from "../../../common/path/join-paths.injectable";
-import { migrationLog } from "../../../migrations/helpers";
 
 interface Pre360ClusterModel extends ClusterModel {
   kubeConfig?: string;
@@ -23,6 +22,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import { clusterStoreMigrationInjectionToken } from "../../../common/cluster-store/migration-token";
 import fsInjectable from "../../../common/fs/fs.injectable";
 import readFileBufferSyncInjectable from "../../../common/fs/read-file-buffer-sync.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
 
 const v360Beta1ClusterStoreMigrationInjectable = getInjectable({
   id: "v3.6.0-beta.1-cluster-store-migration",
@@ -33,6 +33,7 @@ const v360Beta1ClusterStoreMigrationInjectable = getInjectable({
     const readFileSync = di.inject(readFileSyncInjectable);
     const readFileBufferSync = di.inject(readFileBufferSyncInjectable);
     const joinPaths = di.inject(joinPathsInjectable);
+    const logger = di.inject(loggerInjectable);
     const {
       ensureDirSync,
       writeFileSync,
@@ -46,7 +47,7 @@ const v360Beta1ClusterStoreMigrationInjectable = getInjectable({
 
         ensureDirSync(kubeConfigsPath);
 
-        migrationLog("Number of clusters to migrate: ", storedClusters.length);
+        logger.info("Number of clusters to migrate: ", storedClusters.length);
 
         for (const clusterModel of storedClusters) {
           /**
@@ -67,7 +68,7 @@ const v360Beta1ClusterStoreMigrationInjectable = getInjectable({
             delete clusterModel.kubeConfig;
 
           } catch (error) {
-            migrationLog(`Failed to migrate Kubeconfig for cluster "${clusterModel.id}", removing clusterModel...`, error);
+            logger.info(`Failed to migrate Kubeconfig for cluster "${clusterModel.id}", removing clusterModel...`, error);
 
             continue;
           }
@@ -77,7 +78,7 @@ const v360Beta1ClusterStoreMigrationInjectable = getInjectable({
            */
           try {
             if (clusterModel.preferences?.icon) {
-              migrationLog(`migrating ${clusterModel.preferences.icon} for ${clusterModel.preferences.clusterName}`);
+              logger.info(`migrating ${clusterModel.preferences.icon} for ${clusterModel.preferences.clusterName}`);
               const iconPath = clusterModel.preferences.icon.replace("store://", "");
               const fileData = readFileBufferSync(joinPaths(userDataPath, iconPath));
 
@@ -86,7 +87,7 @@ const v360Beta1ClusterStoreMigrationInjectable = getInjectable({
               delete clusterModel.preferences?.icon;
             }
           } catch (error) {
-            migrationLog(`Failed to migrate cluster icon for cluster "${clusterModel.id}"`, error);
+            logger.info(`Failed to migrate cluster icon for cluster "${clusterModel.id}"`, error);
             delete clusterModel.preferences?.icon;
           }
 
diff --git a/src/migrations/helpers.ts b/src/migrations/helpers.ts
deleted file mode 100644
index a3b2efe112..0000000000
--- a/src/migrations/helpers.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type Conf from "conf";
-import type { Migrations } from "conf/dist/source/types";
-import { getOrInsert, iter } from "../common/utils";
-import { isTestEnv } from "../common/vars";
-
-export function migrationLog(...args: any[]) {
-  if (!isTestEnv) {
-    console.log(...args);
-  }
-}
-
-export interface MigrationDeclaration {
-  version: string;
-  run(store: Conf<Partial<Record<string, unknown>>>): void;
-}
-
-export function joinMigrations(...declarations: MigrationDeclaration[]): Migrations<any> {
-  const migrations = new Map<string, MigrationDeclaration["run"][]>();
-
-  for (const decl of declarations) {
-    getOrInsert(migrations, decl.version, []).push(decl.run);
-  }
-
-  return Object.fromEntries(
-    iter.map(
-      migrations,
-      ([v, fns]) => [v, (store: Conf<any>) => {
-        migrationLog(`Running ${v} migration for ${store.path}`);
-
-        for (const fn of fns) {
-          fn(store);
-        }
-      }],
-    ),
-  );
-}