diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplace.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplace.kt index 397836a..aafd340 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplace.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplace.kt @@ -126,7 +126,7 @@ fun provisionRemote(args: Array) { val pwSecret = PromptSecretSource("Password for user $userName on $host").secret() val pwFromSecret = Password(pwSecret.plain()) - val config = getConfig() ?: WorkplaceConfig() + val config = getConfig() Prov.newInstance(RemoteProcessor(host, userName, pwFromSecret)).provisionWorkplace( config.type, config.ssh?.keyPair(), diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Application.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Application.kt index fae8e13..3f1c50d 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Application.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Application.kt @@ -10,7 +10,7 @@ import org.domaindrivenarchitecture.provs.workplace.infrastructure.installDevOps /** * Use case for provisioning repos */ -fun Prov.provision(conf: WorkplaceConfig, let: Password?) = def { +fun Prov.provision(conf: WorkplaceConfig) = def { if (conf.type == WorkplaceType.IDE) { installDevOps() } diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Cli.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Cli.kt index 0e16b97..57a5378 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Cli.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Cli.kt @@ -33,7 +33,7 @@ private fun provision(cliCommand: CliCommand) { val password: Secret? = retrievePassword(cliCommand) val prov: Prov = createProvInstance(cliCommand, password) - prov.provision(conf, password?.let { Password(password.plain()) }) + prov.provision(conf) } catch (e: IllegalArgumentException) { println( "Error: File\u001b[31m $filename \u001b[0m was not found.\n" + diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplaceKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplaceKtTest.kt index d77f11b..3ff94bd 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplaceKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplaceKtTest.kt @@ -36,7 +36,6 @@ internal class ProvisionWorkplaceKtTest { // when // in order to test WorkplaceType.OFFICE: fix installing libreoffice for a fresh container as it hangs the first time but succeeds 2nd time val config = getConfig("src/test/resources/WorkplaceConfigExample.json") - ?: throw Exception("Could not read WorkplaceConfig") val res = a.provisionWorkplace( config.type, config.ssh?.keyPair(),