From db84284f8cb3688db82f77dc402a76fe9a61eb5f Mon Sep 17 00:00:00 2001
From: az <ansgar.zwick@meissa-gmbh.de>
Date: Fri, 9 Sep 2022 13:32:17 +0200
Subject: [PATCH] [skip ci] refactoring method names and reprovision logic

---
 .../provs/desktop/domain/DesktopService.kt    |  4 ++++
 .../provs/server/application/Application.kt   |  4 ++--
 .../provs/server/domain/k3s/K3sService.kt     | 24 ++++++-------------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt
index 15d74be..0a4b2cf 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt
@@ -77,6 +77,8 @@ fun Prov.provisionIdeDesktop(submodules: List<String>?) {
         installIntelliJ()
     } else if (submodules.contains(DesktopSubmodule.VERIFY.name.lowercase())) {
         verifyIdeSetup()
+    } else if (submodules.contains(DesktopSubmodule.FIREFOX.name.lowercase())) {
+        installFirefox()
     }
 }
 
@@ -106,6 +108,8 @@ fun Prov.provisionOfficeDesktop(submodules: List<String>?) {
         aptInstall(SPELLCHECKING_DE)
     } else if (submodules.contains(DesktopSubmodule.VERIFY.name.lowercase())) {
         verifyOfficeSetup()
+    } else if (submodules.contains(DesktopSubmodule.FIREFOX.name.lowercase())) {
+        installFirefox()
     }
 }
 
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Application.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Application.kt
index c698c39..1e37e33 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Application.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Application.kt
@@ -3,7 +3,7 @@ package org.domaindrivenarchitecture.provs.server.application
 import org.domaindrivenarchitecture.provs.framework.core.cli.createProvInstance
 import org.domaindrivenarchitecture.provs.server.domain.ServerType
 import org.domaindrivenarchitecture.provs.server.domain.k3s.K3sCliCommand
-import org.domaindrivenarchitecture.provs.server.domain.k3s.provisionK3s
+import org.domaindrivenarchitecture.provs.server.domain.k3s.provisionK3sCommand
 import kotlin.system.exitProcess
 
 
@@ -33,6 +33,6 @@ fun main(args: Array<String>) {
     }
 
     val prov = createProvInstance(cmd.target)
-    prov.provisionK3s(cmd as K3sCliCommand)
+    prov.provisionK3sCommand(cmd as K3sCliCommand)
 
 }
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sService.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sService.kt
index 6aae2f6..ab67db5 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sService.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sService.kt
@@ -7,37 +7,27 @@ import org.domaindrivenarchitecture.provs.server.infrastructure.*
 import kotlin.system.exitProcess
 
 
-fun Prov.provisionK3s(cli: K3sCliCommand) = task {
+fun Prov.provisionK3sCommand(cli: K3sCliCommand) = task {
 
     val grafanaConfigResolved: GrafanaAgentConfigResolved? = findK8sGrafanaConfig(cli.configFileName)?.resolveSecret()
 
     if (cli.submodules == null ) {
         val k3sConfig: K3sConfig = getK3sConfig(cli.configFileName)
-        val repo: ApplicationFileRepository = DefaultApplicationFileRepository()
-        repo.assertExists(cli.applicationFileName)
+        DefaultApplicationFileRepository().assertExists(cli.applicationFileName)
 
-        if (!cli.reprovision && !k3sConfig.reprovision) {
-            // full k3s
-            provisionK3sWorker(k3sConfig, grafanaConfigResolved, cli.applicationFileName)
-        }
-        if (cli.reprovision && testConfigExists()) {
-            deprovisionK3sInfra()
-            provisionK3sWorker(k3sConfig, grafanaConfigResolved, cli.applicationFileName)
-        }
-        if (k3sConfig.reprovision && testConfigExists()) {
+        if (cli.reprovision || k3sConfig.reprovision) {
             deprovisionK3sInfra()
-            provisionK3sWorker(k3sConfig, grafanaConfigResolved, cli.applicationFileName)
         }
+        provisionK3s(k3sConfig, grafanaConfigResolved, cli.applicationFileName)
     } else {
-        // submodules only
-        provisionGrafanaSanitized(cli.submodules, grafanaConfigResolved)
+        provisionGrafana(cli.submodules, grafanaConfigResolved)
     }
 }
 
 /**
  * Installs a k3s server.
  */
-fun Prov.provisionK3sWorker(
+fun Prov.provisionK3s(
     k3sConfig: K3sConfig,
     grafanaConfigResolved: GrafanaAgentConfigResolved? = null,
     applicationFileName: ApplicationFileName? = null) = task {
@@ -65,7 +55,7 @@ fun Prov.provisionK3sWorker(
     provisionServerCliConvenience()
 }
 
-private fun Prov.provisionGrafanaSanitized(
+private fun Prov.provisionGrafana(
     submodules: List<String>?,
     grafanaConfigResolved: GrafanaAgentConfigResolved?) = task {