From 17a814a11a891dc32701583735f78f096cfc7356 Mon Sep 17 00:00:00 2001
From: erik <erik.seiert@meissa-gmbh.de>
Date: Wed, 24 Aug 2022 13:21:43 +0200
Subject: [PATCH] Move reprovision cmd line option to new branch

---
 .../provs/server/application/CliArgumentsParser.kt   | 12 ++----------
 .../provs/server/domain/k3s/K3sCliCommand.kt         |  3 +--
 .../provs/server/domain/k3s/K3sService.kt            | 10 ++--------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/CliArgumentsParser.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/CliArgumentsParser.kt
index 0b2d4a3..f6e5b3e 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/CliArgumentsParser.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/CliArgumentsParser.kt
@@ -34,8 +34,7 @@ class CliArgumentsParser(name: String) : CliTargetParser(name) {
                 ),
                 module.configFileName,
                 module.applicationFileName,
-                module.submodules,
-                module.reprovision
+                module.submodules
             )
             else -> return ServerCliCommand(
                 ServerType.valueOf(module.name.uppercase()),
@@ -53,7 +52,6 @@ class CliArgumentsParser(name: String) : CliTargetParser(name) {
         var configFileName: ConfigFileName? = null
         var applicationFileName: ApplicationFileName? = null
         var submodules: List<String>? = null
-        var reprovision: Boolean = false
     }
 
     class K3s : ServerSubcommand("k3s", "the k3s module") {
@@ -75,17 +73,11 @@ class CliArgumentsParser(name: String) : CliTargetParser(name) {
             "o",
             "provisions only parts ",
         )
-        val cliReprovision by option(
-            ArgType.Boolean,
-            "reprovision",
-            "r",
-            "redo provisioning, deletes old config first"
-        )
+
         override fun execute() {
             super.configFileName = cliConfigFileName?.let { ConfigFileName(it) }
             super.applicationFileName = cliApplicationFileName?.let { ApplicationFileName(it) }
             super.submodules = if (only != null) listOf(only!!.name.lowercase()) else null
-            super.reprovision = cliReprovision == true
             super.parsed = true
         }
     }
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sCliCommand.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sCliCommand.kt
index 1cca7f6..fda6571 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sCliCommand.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sCliCommand.kt
@@ -10,8 +10,7 @@ class K3sCliCommand(
     target: TargetCliCommand,
     configFileName: ConfigFileName?,
     val applicationFileName: ApplicationFileName?,
-    val submodules: List<String>? = null,
-    val reprovision: Reprovision = false
+    val submodules: List<String>? = null
 ) :
     ServerCliCommand(
         serverType, target, configFileName
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 46c44df..c730dd3 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
@@ -11,17 +11,11 @@ fun Prov.provisionK3s(cli: K3sCliCommand) = task {
 
     val grafanaConfigResolved: GrafanaAgentConfigResolved? = findK8sGrafanaConfig(cli.configFileName)?.resolveSecret()
 
-    if (cli.submodules == null && !cli.reprovision) {
+    if (cli.submodules == null) {
         // full k3s
         val k3sConfig: K3sConfig = getK3sConfig(cli.configFileName)
         provisionK3sWorker(k3sConfig, grafanaConfigResolved, cli.applicationFileName)
-    }
-    else if (cli.reprovision) {
-        deprovisionK3sInfra()
-        val k3sConfig: K3sConfig = getK3sConfig(cli.configFileName)
-        provisionK3sWorker(k3sConfig, grafanaConfigResolved, cli.applicationFileName)
-    }
-    else {
+    } else {
         // submodules only
         provisionGrafanaSanitized(cli.submodules, grafanaConfigResolved)
     }