From 3468fc33b5997ea329f8c7dfe0c06ca1a3f9d73d Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Tue, 7 Jun 2022 13:54:54 +0300
Subject: [PATCH] Remove unwarranted function configuration

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 ...get-active-helm-repositories.injectable.ts | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts
index 6071c597c3..3a47022f1e 100644
--- a/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts
+++ b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts
@@ -36,7 +36,7 @@ const getActiveHelmRepositoriesInjectable = getInjectable({
     const getHelmEnv = di.inject(getHelmEnvInjectable);
     const logger = di.inject(loggerInjectable);
 
-    const getRepositoriesFor = getRepositoriesForFor(readYamlFile);
+    const getRepositories = getRepositoriesFor(readYamlFile);
 
     return async (): Promise<AsyncResult<HelmRepo[]>> => {
       const envResult = await getHelmEnv();
@@ -75,11 +75,6 @@ const getActiveHelmRepositoriesInjectable = getInjectable({
         };
       }
 
-      const getRepositories = getRepositoriesFor(
-        repositoryConfigFilePath,
-        helmRepositoryCacheDirPath,
-      );
-
       const updateResult = await execHelm("repo", "update");
 
       if (!updateResult.callWasSuccessful) {
@@ -89,7 +84,6 @@ const getActiveHelmRepositoriesInjectable = getInjectable({
             error: `Error updating Helm repositories: ${updateResult.error}`,
           };
         }
-
         const resultOfAddingDefaultRepository = await execHelm("repo", "add", "bitnami", "https://charts.bitnami.com/bitnami");
 
         if (!resultOfAddingDefaultRepository.callWasSuccessful) {
@@ -100,32 +94,38 @@ const getActiveHelmRepositoriesInjectable = getInjectable({
         }
       }
 
-      return { callWasSuccessful: true, response: await getRepositories() };
+      return {
+        callWasSuccessful: true,
+
+        response: await getRepositories(
+          repositoryConfigFilePath,
+          helmRepositoryCacheDirPath,
+        ),
+      };
     };
   },
 });
 
 export default getActiveHelmRepositoriesInjectable;
 
-const getRepositoriesForFor =
+const getRepositoriesFor =
   (readYamlFile: ReadYamlFile) =>
-    (repositoryConfigFilePath: string, helmRepositoryCacheDirPath: string) =>
-      async (): Promise<HelmRepo[]> => {
-        const { repositories } = (await readYamlFile(
-          repositoryConfigFilePath,
-        )) as HelmRepositoriesFromYaml;
+    async (repositoryConfigFilePath: string, helmRepositoryCacheDirPath: string): Promise<HelmRepo[]> => {
+      const { repositories } = (await readYamlFile(
+        repositoryConfigFilePath,
+      )) as HelmRepositoriesFromYaml;
 
-        return repositories.map((repository) => ({
-          name: repository.name,
-          url: repository.url,
-          caFile: repository.caFile,
-          certFile: repository.certFile,
-          insecureSkipTlsVerify: repository.insecure_skip_tls_verify,
-          keyFile: repository.keyFile,
-          username: repository.username,
-          password: repository.password,
-          cacheFilePath: `${helmRepositoryCacheDirPath}/${repository.name}-index.yaml`,
-        }));
-      };
+      return repositories.map((repository) => ({
+        name: repository.name,
+        url: repository.url,
+        caFile: repository.caFile,
+        certFile: repository.certFile,
+        insecureSkipTlsVerify: repository.insecure_skip_tls_verify,
+        keyFile: repository.keyFile,
+        username: repository.username,
+        password: repository.password,
+        cacheFilePath: `${helmRepositoryCacheDirPath}/${repository.name}-index.yaml`,
+      }));
+    };
 
 const internalHelmErrorForNoRepositoriesFound = "no repositories found. You must add one before updating";