From acfc5ae753c000b7b1c374c3c6ddf887b44c7d94 Mon Sep 17 00:00:00 2001 From: ansgarz Date: Wed, 15 Dec 2021 19:41:36 +0100 Subject: [PATCH] refactoring workplace Application.kt & improve CliApplication.puml --- docs/CliApplication.puml | 4 ++-- .../provs/workplace/application/Application.kt | 4 ++-- .../provs/workplace/application/CliWorkplace.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/CliApplication.puml b/docs/CliApplication.puml index 6217884..324c54f 100644 --- a/docs/CliApplication.puml +++ b/docs/CliApplication.puml @@ -52,8 +52,8 @@ WorkplaceConfig <- ConfigRepository : create WorkplaceConfig --> ConfigRepository : config CliWorkplace <-- ConfigRepository : config -CliWorkplace -> Application : provision -Application -> ProvInstance : provisionWorkplace +CliWorkplace -> Application : provision ( config ) +Application -> ProvInstance : provisionWorkplace ( type, ssh, ...) ProvInstance -> ProvisionWorkplace : provisionWorkplace ProvisionWorkplace -> InfrastructureModules: Various calls like: 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 3d9b9da..3a34778 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Application.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Application.kt @@ -7,8 +7,8 @@ import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceConfig /** * Use case for provisioning a workplace */ -fun Prov.provision(conf: WorkplaceConfig) = def { +fun provision(prov: Prov, conf: WorkplaceConfig) { with (conf) { - provisionWorkplace(type, ssh?.keyPair(), gpg?.keyPair(), gitUserName, gitEmail) + prov.provisionWorkplace(type, ssh?.keyPair(), gpg?.keyPair(), gitUserName, gitEmail) } } diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplace.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplace.kt index f772067..90c861f 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplace.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplace.kt @@ -29,8 +29,8 @@ private fun provisionWorkplace(cliCommand: WorkplaceCliCommand) { try { val conf = getConfig(filename) - val prov = createProvInstance(cliCommand.target) - prov.provision(conf) + val prov = createProvInstance(cliCommand.target, remoteHostSetSudoWithoutPasswordRequired = true) + provision(prov, conf) } catch (e: IllegalArgumentException) { println(