From 949fe0c1afa7e56437bca589be450448a6b8e865 Mon Sep 17 00:00:00 2001 From: erik Date: Wed, 17 Aug 2022 15:32:38 +0200 Subject: [PATCH] Correct server type check Checking the serverType/subcommand from string input. Before the check was done after parsing string input, when an unknown server type was entered a "Too many arguments!" error was issued due to the parser falsely interpreting the input. --- .../provs/server/application/Application.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 a61c469..e87394f 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Application.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Application.kt @@ -19,9 +19,15 @@ fun main(args: Array) { val checkedArgs = if (args.isEmpty()) arrayOf("-h") else args + // validate subcommand + if (!ServerType.values().any {it.name.lowercase() == args[0]}) { + println("Unknown serverType. Currently only k3s is accepted.") + exitProcess(1) + } + val cmd = CliArgumentsParser("provs-server.jar subcommand target").parseCommand(checkedArgs) - // input validation + // validate parsed arguments if (!cmd.isValidTarget()) { println("Remote or localhost not valid, please try -h for help.") exitProcess(1)