meissa/provs
7
1
Fork 0
Code Issues Pull requests Projects Releases 12 Packages Wiki Activity

fix compiler warnings

Browse source
This commit is contained in:
ansgarz 2021-10-09 13:41:25 +02:00
parent 1493977672
commit 038c775c3f
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplace.kt
View file

@ -126,7 +126,7 @@ fun provisionRemote(args: Array<String>) {
val pwSecret = PromptSecretSource("Password for user $userName on $host").secret() val pwSecret = PromptSecretSource("Password for user $userName on $host").secret()
val pwFromSecret = Password(pwSecret.plain()) val pwFromSecret = Password(pwSecret.plain())
val config = getConfig() ?: WorkplaceConfig() val config = getConfig()
Prov.newInstance(RemoteProcessor(host, userName, pwFromSecret)).provisionWorkplace( Prov.newInstance(RemoteProcessor(host, userName, pwFromSecret)).provisionWorkplace(
config.type, config.type,
config.ssh?.keyPair(), config.ssh?.keyPair(),

2
src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Application.kt
View file

@ -10,7 +10,7 @@ import org.domaindrivenarchitecture.provs.workplace.infrastructure.installDevOps
/** /**
* Use case for provisioning repos * Use case for provisioning repos
*/ */
fun Prov.provision(conf: WorkplaceConfig, let: Password?) = def { fun Prov.provision(conf: WorkplaceConfig) = def {
if (conf.type == WorkplaceType.IDE) { if (conf.type == WorkplaceType.IDE) {
installDevOps() installDevOps()
} }

2
src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Cli.kt
View file

@ -33,7 +33,7 @@ private fun provision(cliCommand: CliCommand) {
val password: Secret? = retrievePassword(cliCommand) val password: Secret? = retrievePassword(cliCommand)
val prov: Prov = createProvInstance(cliCommand, password) val prov: Prov = createProvInstance(cliCommand, password)
prov.provision(conf, password?.let { Password(password.plain()) }) prov.provision(conf)
} catch (e: IllegalArgumentException) { } catch (e: IllegalArgumentException) {
println( println(
"Error: File\u001b[31m $filename \u001b[0m was not found.\n" + "Error: File\u001b[31m $filename \u001b[0m was not found.\n" +

1
src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplaceKtTest.kt
View file

@ -36,7 +36,6 @@ internal class ProvisionWorkplaceKtTest {
// when // when
// in order to test WorkplaceType.OFFICE: fix installing libreoffice for a fresh container as it hangs the first time but succeeds 2nd time // 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") val config = getConfig("src/test/resources/WorkplaceConfigExample.json")
?: throw Exception("Could not read WorkplaceConfig")
val res = a.provisionWorkplace( val res = a.provisionWorkplace(
config.type, config.type,
config.ssh?.keyPair(), config.ssh?.keyPair(),