diff --git a/README.md b/README.md index 335fb29..e917bc1 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Run: You'll be prompted for the password of the remote user. -### Install k3s +### Provision k3s ```bash java -jar provs-server.jar -i -r -u diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/demos/HelloWorld.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/demos/HelloWorld.kt index 8b3b7d8..c46fdce 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/demos/HelloWorld.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/demos/HelloWorld.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.extensions.demos -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.local +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.local fun Prov.helloWorld() = def { diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/demos/SystemInfos.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/demos/SystemInfos.kt index 2488d52..c498989 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/demos/SystemInfos.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/demos/SystemInfos.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.extensions.demos -import org.domaindrivenarchitecture.provs.core.* +import org.domaindrivenarchitecture.provs.framework.core.* /** diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/Application.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/Application.kt index d4d6676..47bd270 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/Application.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/Application.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application -import org.domaindrivenarchitecture.provs.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain.installK3sServer diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/Cli.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/Cli.kt index 0c4eeb1..23eebf5 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/Cli.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/Cli.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application -import org.domaindrivenarchitecture.provs.core.cli.createProvInstance +import org.domaindrivenarchitecture.provs.framework.core.cli.createProvInstance import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain.installK3sAsContainers import kotlin.system.exitProcess diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sArgumentsParser.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sArgumentsParser.kt index 5c60bbe..e1e3729 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sArgumentsParser.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sArgumentsParser.kt @@ -2,7 +2,7 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.applic import kotlinx.cli.ArgType import kotlinx.cli.default -import org.domaindrivenarchitecture.provs.core.cli.CliTargetParser +import org.domaindrivenarchitecture.provs.framework.core.cli.CliTargetParser class CliK3sArgumentsParser(name: String) : CliTargetParser(name) { diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sCommand.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sCommand.kt index 76eee68..4c88870 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sCommand.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sCommand.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application -import org.domaindrivenarchitecture.provs.core.cli.TargetCliCommand +import org.domaindrivenarchitecture.provs.framework.core.cli.TargetCliCommand class ServerCliCommand(private val k3sType: String, val target: TargetCliCommand) { @@ -29,7 +29,8 @@ fun parseServerArguments( parser.sshWithPasswordPrompt, parser.sshWithGopassPath, parser.sshWithKey - )) + ) + ) } diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3d.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3d.kt index 4a43096..6150d03 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3d.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3d.kt @@ -1,9 +1,9 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.docker.provideContainer -import org.domaindrivenarchitecture.provs.core.echoCommandForTextWithNewlinesReplaced -import org.domaindrivenarchitecture.provs.core.repeatTaskUntilSuccess +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.docker.provideContainer +import org.domaindrivenarchitecture.provs.framework.core.echoCommandForTextWithNewlinesReplaced +import org.domaindrivenarchitecture.provs.framework.core.repeatTaskUntilSuccess /** diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3s.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3s.kt index 739d3d0..de4932d 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3s.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3s.kt @@ -1,8 +1,8 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult -import org.domaindrivenarchitecture.provs.core.echoCommandForText +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.echoCommandForText import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/infrastructure/apple/Apple.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/infrastructure/apple/Apple.kt index d3d9c9e..d3cac17 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/infrastructure/apple/Apple.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/infrastructure/apple/Apple.kt @@ -1,9 +1,9 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.infrastructure.apple -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult -import org.domaindrivenarchitecture.provs.core.remote -import org.domaindrivenarchitecture.provs.core.repeatTaskUntilSuccess +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.remote +import org.domaindrivenarchitecture.provs.framework.core.repeatTaskUntilSuccess import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain.applyK3sConfig import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain.installK3sServer diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/certbot/ProvisionCertbot.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/certbot/ProvisionCertbot.kt index e52023b..236e72e 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/certbot/ProvisionCertbot.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/certbot/ProvisionCertbot.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.certbot -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewall.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewall.kt index 89e630f..b61807d 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewall.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewall.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.firewall -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/base/FirewallBackup.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/base/FirewallBackup.kt index 032bff3..bbf225c 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/base/FirewallBackup.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/base/FirewallBackup.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.firewall.base -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import java.time.LocalDateTime import java.time.format.DateTimeFormatter diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt index 2f96613..3013fe2 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt @@ -1,9 +1,9 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nexus -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult -import org.domaindrivenarchitecture.provs.core.docker.containerRuns -import org.domaindrivenarchitecture.provs.core.remote +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.docker.containerRuns +import org.domaindrivenarchitecture.provs.framework.core.remote import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall import org.domaindrivenarchitecture.provs.ubuntu.user.base.createUser diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt index fb5e08e..3468602 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt @@ -1,8 +1,8 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult -import org.domaindrivenarchitecture.provs.core.remote +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.remote import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/BasicAuth.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/BasicAuth.kt index d2dab99..9532cbf 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/BasicAuth.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/BasicAuth.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Secret import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall fun Prov.nginxAddBasicAuth(user: String, password: Secret) = requireAll { diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Locations.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Locations.kt index dc391d5..d037617 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Locations.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Locations.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.* diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/SelfSignedCertificate.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/SelfSignedCertificate.kt index b4034f9..a15c2d6 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/SelfSignedCertificate.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/SelfSignedCertificate.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base -import org.domaindrivenarchitecture.provs.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDirs import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/ProvisionPrometheus.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/ProvisionPrometheus.kt index 4d61c0f..f3dc068 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/ProvisionPrometheus.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/ProvisionPrometheus.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus -import org.domaindrivenarchitecture.provs.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base.* /** diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/NodeExporter.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/NodeExporter.kt index 2aedfa7..7b33916 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/NodeExporter.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/NodeExporter.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base -import org.domaindrivenarchitecture.provs.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileContainsText diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/Prometheus.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/Prometheus.kt index a795998..17d292b 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/Prometheus.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/Prometheus.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.docker.containerRuns +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.docker.containerRuns import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDirs import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/Prov.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Prov.kt similarity index 97% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/Prov.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Prov.kt index 5908e11..2bc0da5 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/Prov.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Prov.kt @@ -1,9 +1,9 @@ -package org.domaindrivenarchitecture.provs.core +package org.domaindrivenarchitecture.provs.framework.core -import org.domaindrivenarchitecture.provs.core.platforms.SHELL -import org.domaindrivenarchitecture.provs.core.platforms.UbuntuProv -import org.domaindrivenarchitecture.provs.core.processors.LocalProcessor -import org.domaindrivenarchitecture.provs.core.processors.Processor +import org.domaindrivenarchitecture.provs.framework.core.platforms.SHELL +import org.domaindrivenarchitecture.provs.framework.core.platforms.UbuntuProv +import org.domaindrivenarchitecture.provs.framework.core.processors.LocalProcessor +import org.domaindrivenarchitecture.provs.framework.core.processors.Processor import org.slf4j.LoggerFactory diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/ProvResult.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/ProvResult.kt similarity index 94% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/ProvResult.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/ProvResult.kt index e625d68..291e30a 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/ProvResult.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/ProvResult.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core +package org.domaindrivenarchitecture.provs.framework.core data class ProvResult(val success: Boolean, diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/Secret.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Secret.kt similarity index 89% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/Secret.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Secret.kt index e024ebd..e770d6a 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/Secret.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Secret.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core +package org.domaindrivenarchitecture.provs.framework.core import java.util.* diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/TaskFunctions.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/TaskFunctions.kt similarity index 89% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/TaskFunctions.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/TaskFunctions.kt index bdcfc64..595a047 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/TaskFunctions.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/TaskFunctions.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core +package org.domaindrivenarchitecture.provs.framework.core /** diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/Utils.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Utils.kt similarity index 93% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/Utils.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Utils.kt index 5c7e174..dad937b 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/Utils.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Utils.kt @@ -1,10 +1,10 @@ -package org.domaindrivenarchitecture.provs.core +package org.domaindrivenarchitecture.provs.framework.core -import org.domaindrivenarchitecture.provs.core.docker.provideContainer -import org.domaindrivenarchitecture.provs.core.processors.ContainerStartMode -import org.domaindrivenarchitecture.provs.core.processors.ContainerUbuntuHostProcessor -import org.domaindrivenarchitecture.provs.core.processors.RemoteProcessor -import org.domaindrivenarchitecture.provs.core.tags.Api +import org.domaindrivenarchitecture.provs.framework.core.docker.provideContainer +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerStartMode +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerUbuntuHostProcessor +import org.domaindrivenarchitecture.provs.framework.core.processors.RemoteProcessor +import org.domaindrivenarchitecture.provs.framework.core.tags.Api import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileContent import java.io.File import java.net.InetAddress diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliTargetCommand.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliTargetCommand.kt similarity index 94% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliTargetCommand.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliTargetCommand.kt index 4330fd8..44d3a31 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliTargetCommand.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliTargetCommand.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core.cli +package org.domaindrivenarchitecture.provs.framework.core.cli class TargetCliCommand( diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliTargetParser.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliTargetParser.kt similarity index 94% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliTargetParser.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliTargetParser.kt index 1460c8d..11f4745 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliTargetParser.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliTargetParser.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core.cli +package org.domaindrivenarchitecture.provs.framework.core.cli import kotlinx.cli.ArgParser import kotlinx.cli.ArgType diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliUtils.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliUtils.kt similarity index 92% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliUtils.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliUtils.kt index 66419e1..37145cc 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliUtils.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliUtils.kt @@ -1,9 +1,9 @@ -package org.domaindrivenarchitecture.provs.core.cli +package org.domaindrivenarchitecture.provs.framework.core.cli -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.Secret -import org.domaindrivenarchitecture.provs.core.local -import org.domaindrivenarchitecture.provs.core.remote +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.local +import org.domaindrivenarchitecture.provs.framework.core.remote import org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources.GopassSecretSource import org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources.PromptSecretSource import org.domaindrivenarchitecture.provs.ubuntu.user.base.currentUserCanSudo diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/docker/HostDocker.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/HostDocker.kt similarity index 83% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/docker/HostDocker.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/HostDocker.kt index 57c5ccc..460a1df 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/docker/HostDocker.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/HostDocker.kt @@ -1,11 +1,12 @@ -package org.domaindrivenarchitecture.provs.core.docker +package org.domaindrivenarchitecture.provs.framework.core.docker -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult -import org.domaindrivenarchitecture.provs.core.docker.dockerimages.DockerImage -import org.domaindrivenarchitecture.provs.core.docker.platforms.* -import org.domaindrivenarchitecture.provs.core.platforms.UbuntuProv -import org.domaindrivenarchitecture.provs.core.processors.ContainerStartMode +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.docker.dockerimages.DockerImage +import org.domaindrivenarchitecture.provs.framework.core.docker.platforms.* +import org.domaindrivenarchitecture.provs.framework.core.platforms.UbuntuProv +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerStartMode +import org.domaindrivenarchitecture.provs.framework.core.docker.platforms.* private const val DOCKER_NOT_SUPPORTED = "docker not yet supported for " diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/docker/dockerimages/DockerImages.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/dockerimages/DockerImages.kt similarity index 90% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/docker/dockerimages/DockerImages.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/dockerimages/DockerImages.kt index f2bdfbb..6261b6a 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/docker/dockerimages/DockerImages.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/dockerimages/DockerImages.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core.docker.dockerimages +package org.domaindrivenarchitecture.provs.framework.core.docker.dockerimages interface DockerImage { diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/docker/platforms/UbuntuHostDocker.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/platforms/UbuntuHostDocker.kt similarity index 78% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/docker/platforms/UbuntuHostDocker.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/platforms/UbuntuHostDocker.kt index 015c70e..3bc0649 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/docker/platforms/UbuntuHostDocker.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/platforms/UbuntuHostDocker.kt @@ -1,15 +1,15 @@ -package org.domaindrivenarchitecture.provs.core.docker.platforms +package org.domaindrivenarchitecture.provs.framework.core.docker.platforms -import org.domaindrivenarchitecture.provs.core.ProvResult -import org.domaindrivenarchitecture.provs.core.docker.containerRuns -import org.domaindrivenarchitecture.provs.core.docker.dockerImageExists -import org.domaindrivenarchitecture.provs.core.docker.dockerimages.DockerImage -import org.domaindrivenarchitecture.provs.core.docker.exitAndRmContainer -import org.domaindrivenarchitecture.provs.core.escapeSingleQuote -import org.domaindrivenarchitecture.provs.core.fileSeparator -import org.domaindrivenarchitecture.provs.core.hostUserHome -import org.domaindrivenarchitecture.provs.core.platforms.UbuntuProv -import org.domaindrivenarchitecture.provs.core.processors.ContainerStartMode +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.docker.containerRuns +import org.domaindrivenarchitecture.provs.framework.core.docker.dockerImageExists +import org.domaindrivenarchitecture.provs.framework.core.docker.dockerimages.DockerImage +import org.domaindrivenarchitecture.provs.framework.core.docker.exitAndRmContainer +import org.domaindrivenarchitecture.provs.framework.core.escapeSingleQuote +import org.domaindrivenarchitecture.provs.framework.core.fileSeparator +import org.domaindrivenarchitecture.provs.framework.core.hostUserHome +import org.domaindrivenarchitecture.provs.framework.core.platforms.UbuntuProv +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerStartMode fun UbuntuProv.provideContainerPlatform( diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/entry/Entry.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/entry/Entry.kt similarity index 95% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/entry/Entry.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/entry/Entry.kt index c329021..083ee8f 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/entry/Entry.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/entry/Entry.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core.entry +package org.domaindrivenarchitecture.provs.framework.core.entry /** * Calls a static method of a class. diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/platforms/UbuntuProv.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/platforms/UbuntuProv.kt similarity index 72% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/platforms/UbuntuProv.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/platforms/UbuntuProv.kt index 86c98f0..17d53a4 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/platforms/UbuntuProv.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/platforms/UbuntuProv.kt @@ -1,11 +1,11 @@ -package org.domaindrivenarchitecture.provs.core.platforms +package org.domaindrivenarchitecture.provs.framework.core.platforms -import org.domaindrivenarchitecture.provs.core.ProgressType -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult -import org.domaindrivenarchitecture.provs.core.escapeAndEncloseByDoubleQuoteForShell -import org.domaindrivenarchitecture.provs.core.processors.LocalProcessor -import org.domaindrivenarchitecture.provs.core.processors.Processor +import org.domaindrivenarchitecture.provs.framework.core.ProgressType +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.escapeAndEncloseByDoubleQuoteForShell +import org.domaindrivenarchitecture.provs.framework.core.processors.LocalProcessor +import org.domaindrivenarchitecture.provs.framework.core.processors.Processor const val SHELL = "/bin/bash" diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerUbuntuHostProcessor.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerUbuntuHostProcessor.kt similarity index 81% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerUbuntuHostProcessor.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerUbuntuHostProcessor.kt index e7e1585..5df69db 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerUbuntuHostProcessor.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerUbuntuHostProcessor.kt @@ -1,11 +1,11 @@ -package org.domaindrivenarchitecture.provs.core.processors +package org.domaindrivenarchitecture.provs.framework.core.processors -import org.domaindrivenarchitecture.provs.core.ProgressType -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.docker.provideContainer -import org.domaindrivenarchitecture.provs.core.escapeAndEncloseByDoubleQuoteForShell -import org.domaindrivenarchitecture.provs.core.platforms.SHELL -import org.domaindrivenarchitecture.provs.core.tags.Api +import org.domaindrivenarchitecture.provs.framework.core.ProgressType +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.docker.provideContainer +import org.domaindrivenarchitecture.provs.framework.core.escapeAndEncloseByDoubleQuoteForShell +import org.domaindrivenarchitecture.provs.framework.core.platforms.SHELL +import org.domaindrivenarchitecture.provs.framework.core.tags.Api enum class ContainerStartMode { USE_RUNNING_ELSE_CREATE, diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/LocalProcessor.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/LocalProcessor.kt similarity index 93% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/LocalProcessor.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/LocalProcessor.kt index e188e4b..1449d2d 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/LocalProcessor.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/LocalProcessor.kt @@ -1,6 +1,6 @@ -package org.domaindrivenarchitecture.provs.core.processors +package org.domaindrivenarchitecture.provs.framework.core.processors -import org.domaindrivenarchitecture.provs.core.escapeNewline +import org.domaindrivenarchitecture.provs.framework.core.escapeNewline import org.slf4j.LoggerFactory import java.io.File import java.io.IOException diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/PrintOnlyProcessor.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/PrintOnlyProcessor.kt similarity index 87% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/PrintOnlyProcessor.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/PrintOnlyProcessor.kt index 868d0ef..bbde5ed 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/PrintOnlyProcessor.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/PrintOnlyProcessor.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core.processors +package org.domaindrivenarchitecture.provs.framework.core.processors @Suppress("unused") // used externally diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/Processor.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/Processor.kt similarity index 96% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/Processor.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/Processor.kt index c868066..6f34551 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/Processor.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/Processor.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core.processors +package org.domaindrivenarchitecture.provs.framework.core.processors interface Processor { diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/RemoteUbuntuProcessor.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/RemoteUbuntuProcessor.kt similarity index 91% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/RemoteUbuntuProcessor.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/RemoteUbuntuProcessor.kt index 09939b9..b0b4f96 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/processors/RemoteUbuntuProcessor.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/RemoteUbuntuProcessor.kt @@ -1,9 +1,9 @@ -package org.domaindrivenarchitecture.provs.core.processors +package org.domaindrivenarchitecture.provs.framework.core.processors -import org.domaindrivenarchitecture.provs.core.Secret -import org.domaindrivenarchitecture.provs.core.escapeAndEncloseByDoubleQuoteForShell -import org.domaindrivenarchitecture.provs.core.escapeNewline -import org.domaindrivenarchitecture.provs.core.platforms.SHELL +import org.domaindrivenarchitecture.provs.framework.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.escapeAndEncloseByDoubleQuoteForShell +import org.domaindrivenarchitecture.provs.framework.core.escapeNewline +import org.domaindrivenarchitecture.provs.framework.core.platforms.SHELL import net.schmizz.sshj.SSHClient import net.schmizz.sshj.connection.channel.direct.Session import net.schmizz.sshj.connection.channel.direct.Session.Command diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/tags/Api.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/tags/Api.kt similarity index 79% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/core/tags/Api.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/tags/Api.kt index 9d9bd08..bdd966e 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/core/tags/Api.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/tags/Api.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core.tags +package org.domaindrivenarchitecture.provs.framework.core.tags @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION) @Retention(AnnotationRetention.SOURCE) diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/filesystem/base/Filesystem.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/filesystem/base/Filesystem.kt index 4dbdebd..138ec15 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/filesystem/base/Filesystem.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/filesystem/base/Filesystem.kt @@ -1,7 +1,8 @@ package org.domaindrivenarchitecture.provs.ubuntu.filesystem.base -import org.domaindrivenarchitecture.provs.core.* -import org.domaindrivenarchitecture.provs.core.platforms.SHELL +import org.domaindrivenarchitecture.provs.framework.core.platforms.SHELL +import org.domaindrivenarchitecture.provs.framework.core.* +import org.domaindrivenarchitecture.provs.framework.core.getLocalFileContent import java.io.File diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/ProvisionGit.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/ProvisionGit.kt index f96b57a..e292d9f 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/ProvisionGit.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/ProvisionGit.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.ubuntu.git -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/base/Git.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/base/Git.kt index 95c832c..3bb51a6 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/base/Git.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/base/Git.kt @@ -1,10 +1,10 @@ package org.domaindrivenarchitecture.provs.ubuntu.git.base -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.* import org.domaindrivenarchitecture.provs.ubuntu.keys.base.isHostKnown -import org.domaindrivenarchitecture.provs.core.echoCommandForText +import org.domaindrivenarchitecture.provs.framework.core.echoCommandForText import java.io.File val knownHostsFile = "~/.ssh/known_hosts" diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/install/base/Install.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/install/base/Install.kt index e1ca687..ec6a546 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/install/base/Install.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/install/base/Install.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.ubuntu.install.base -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult private var aptInit = false diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/ProvisionKeys.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/ProvisionKeys.kt index c9758c2..24e153d 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/ProvisionKeys.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/ProvisionKeys.kt @@ -1,8 +1,8 @@ package org.domaindrivenarchitecture.provs.ubuntu.keys -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult -import org.domaindrivenarchitecture.provs.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Secret import org.domaindrivenarchitecture.provs.ubuntu.keys.base.configureGpgKeys import org.domaindrivenarchitecture.provs.ubuntu.keys.base.configureSshKeys import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSourceType diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/Gpg.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/Gpg.kt index 67b49c8..a7ce4f8 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/Gpg.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/Gpg.kt @@ -1,14 +1,14 @@ package org.domaindrivenarchitecture.provs.ubuntu.keys.base -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createSecretFile import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.dirExists import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPair -import org.domaindrivenarchitecture.provs.core.echoCommandForText +import org.domaindrivenarchitecture.provs.framework.core.echoCommandForText /** diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/Ssh.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/Ssh.kt index ac84160..ff5af78 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/Ssh.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/Ssh.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.ubuntu.keys.base -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createSecretFile import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPair diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/SecretSource.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/SecretSource.kt index 438cf4e..e49fb67 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/SecretSource.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/SecretSource.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.ubuntu.secret -import org.domaindrivenarchitecture.provs.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.Secret import org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources.* import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/FileSecretSource.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/FileSecretSource.kt index be188d6..a43ffa6 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/FileSecretSource.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/FileSecretSource.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Secret import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/GopassSecretSource.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/GopassSecretSource.kt index e05fb52..880be5c 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/GopassSecretSource.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/GopassSecretSource.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Secret import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PassSecretSource.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PassSecretSource.kt index ac537de..350f331 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PassSecretSource.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PassSecretSource.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Secret import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PlainSecretSource.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PlainSecretSource.kt index cf6f795..ff51249 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PlainSecretSource.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PlainSecretSource.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources -import org.domaindrivenarchitecture.provs.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.Secret import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PromptSecretSource.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PromptSecretSource.kt index a2ab4cd..13f4bd3 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PromptSecretSource.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PromptSecretSource.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources -import org.domaindrivenarchitecture.provs.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.Secret import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource import java.awt.FlowLayout import javax.swing.* diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/base/User.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/base/User.kt index 82d1477..a3dd784 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/base/User.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/base/User.kt @@ -1,9 +1,9 @@ package org.domaindrivenarchitecture.provs.ubuntu.user.base -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult -import org.domaindrivenarchitecture.provs.core.Secret -import org.domaindrivenarchitecture.provs.core.processors.RemoteProcessor +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.processors.RemoteProcessor import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDirs import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.userHome diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/web/base/Web.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/web/base/Web.kt index e5c6995..b1153b6 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/web/base/Web.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/web/base/Web.kt @@ -1,8 +1,8 @@ package org.domaindrivenarchitecture.provs.ubuntu.web.base -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult -import org.domaindrivenarchitecture.provs.core.tags.Api +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.tags.Api import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDirs import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.deleteFile import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall 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 3a34778..1dbf998 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Application.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/Application.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.workplace.application -import org.domaindrivenarchitecture.provs.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.workplace.domain.provisionWorkplace import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceConfig 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 1ac8ce2..2092cf3 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplace.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplace.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.workplace.application import kotlinx.serialization.SerializationException -import org.domaindrivenarchitecture.provs.core.cli.createProvInstance +import org.domaindrivenarchitecture.provs.framework.core.cli.createProvInstance import org.domaindrivenarchitecture.provs.workplace.infrastructure.getConfig import java.io.FileNotFoundException import kotlin.system.exitProcess diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceCommand.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceCommand.kt index b6bca41..15e5b91 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceCommand.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceCommand.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.workplace.application -import org.domaindrivenarchitecture.provs.core.cli.TargetCliCommand +import org.domaindrivenarchitecture.provs.framework.core.cli.TargetCliCommand class WorkplaceCliCommand(val configFile: String, val target: TargetCliCommand) { diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceParser.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceParser.kt index becab73..1588fae 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceParser.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceParser.kt @@ -2,8 +2,8 @@ package org.domaindrivenarchitecture.provs.workplace.application import kotlinx.cli.ArgType import kotlinx.cli.optional -import org.domaindrivenarchitecture.provs.core.cli.CliTargetParser -import org.domaindrivenarchitecture.provs.core.cli.TargetCliCommand +import org.domaindrivenarchitecture.provs.framework.core.cli.CliTargetParser +import org.domaindrivenarchitecture.provs.framework.core.cli.TargetCliCommand open class CliWorkplaceParser(name: String) : CliTargetParser(name) { diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/ProvisionWorkplace.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/ProvisionWorkplace.kt index 93f7a17..a1fcba0 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/ProvisionWorkplace.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/ProvisionWorkplace.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.workplace.domain -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.git.provisionGit import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstallFromPpa diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Bash.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Bash.kt index 2b72118..39fedd7 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Bash.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Bash.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.* import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall import java.io.File diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepository.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepository.kt index d70656b..5c96f21 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepository.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepository.kt @@ -2,7 +2,7 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure import com.charleskorn.kaml.Yaml import kotlinx.serialization.json.Json -import org.domaindrivenarchitecture.provs.core.tags.Api +import org.domaindrivenarchitecture.provs.framework.core.tags.Api import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceConfig import java.io.BufferedReader import java.io.FileReader diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOps.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOps.kt index 06d5825..5c5364e 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOps.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOps.kt @@ -1,8 +1,8 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult -import org.domaindrivenarchitecture.provs.core.local +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.local import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.* import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall import org.domaindrivenarchitecture.provs.ubuntu.web.base.downloadFromURL diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Docker.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Docker.kt index 9bb592a..3c6c8ec 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Docker.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Docker.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure -import org.domaindrivenarchitecture.provs.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall fun Prov.installDocker() = def { diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Fakturama.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Fakturama.kt index d8461a0..4695bf4 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Fakturama.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Fakturama.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure -import org.domaindrivenarchitecture.provs.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir import org.domaindrivenarchitecture.provs.ubuntu.web.base.downloadFromURL diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Gopass.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Gopass.kt index 976caf4..732c7ef 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Gopass.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Gopass.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.* import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall import org.domaindrivenarchitecture.provs.ubuntu.install.base.isPackageInstalled diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/GopassBridge.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/GopassBridge.kt index 042de71..2137235 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/GopassBridge.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/GopassBridge.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDirs import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.userHome diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/IntelliJ.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/IntelliJ.kt index 231e53e..163e39f 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/IntelliJ.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/IntelliJ.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure -import org.domaindrivenarchitecture.provs.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Prov fun Prov.installIntelliJ() = task { diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/NoSwappiness.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/NoSwappiness.kt index 0207cf4..7ddaa40 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/NoSwappiness.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/NoSwappiness.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure -import org.domaindrivenarchitecture.provs.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.addTextToFile import java.io.File diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Python.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Python.kt index 2ed1302..716e8b8 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Python.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Python.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Redshift.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Redshift.kt index 67ea7d4..42c0508 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Redshift.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Redshift.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure -import org.domaindrivenarchitecture.provs.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCode.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCode.kt index d6f204a..481306c 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCode.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCode.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall import org.domaindrivenarchitecture.provs.ubuntu.install.base.isPackageInstalled diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VirtualBoxGuest.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VirtualBoxGuest.kt index b8bc39f..2d11890 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VirtualBoxGuest.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VirtualBoxGuest.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall import org.domaindrivenarchitecture.provs.ubuntu.user.base.whoami diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Zim.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Zim.kt index caad15f..72e9724 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Zim.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Zim.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstallFromPpa import org.domaindrivenarchitecture.provs.ubuntu.install.base.isPackageInstalled diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/ProvTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/ProvTest.kt index ca02d9d..e5d5daf 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/ProvTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/ProvTest.kt @@ -1,7 +1,11 @@ package org.domaindrivenarchitecture.provs.core import ch.qos.logback.classic.Level -import org.domaindrivenarchitecture.provs.core.docker.provideContainer +import org.domaindrivenarchitecture.provs.framework.core.docker.provideContainer +import org.domaindrivenarchitecture.provs.framework.core.ProgressType +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.remote import org.domaindrivenarchitecture.provs.test.setRootLoggingLevel import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.test.tags.NonCi diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/TaskFunctionsKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/TaskFunctionsKtTest.kt index e4037fe..e04b092 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/TaskFunctionsKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/TaskFunctionsKtTest.kt @@ -1,5 +1,8 @@ package org.domaindrivenarchitecture.provs.core +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.repeatTaskUntilSuccess import org.domaindrivenarchitecture.provs.test.testLocal import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/UtilsKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/UtilsKtTest.kt index 698086e..71ad03f 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/UtilsKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/UtilsKtTest.kt @@ -1,5 +1,9 @@ package org.domaindrivenarchitecture.provs.core +import org.domaindrivenarchitecture.provs.framework.core.getCallingMethodName +import org.domaindrivenarchitecture.provs.framework.core.getLocalFileContent +import org.domaindrivenarchitecture.provs.framework.core.getResourceAsText +import org.domaindrivenarchitecture.provs.framework.core.remote import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.junit.jupiter.api.Assertions.* diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliCommandKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliCommandKtTest.kt index f521b47..83be896 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliCommandKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliCommandKtTest.kt @@ -4,11 +4,14 @@ import io.mockk.every import io.mockk.mockkStatic import io.mockk.unmockkStatic import io.mockk.verify -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.Secret -import org.domaindrivenarchitecture.provs.core.local -import org.domaindrivenarchitecture.provs.core.processors.PrintOnlyProcessor -import org.domaindrivenarchitecture.provs.core.remote +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.local +import org.domaindrivenarchitecture.provs.framework.core.processors.PrintOnlyProcessor +import org.domaindrivenarchitecture.provs.framework.core.cli.TargetCliCommand +import org.domaindrivenarchitecture.provs.framework.core.cli.createProvInstance +import org.domaindrivenarchitecture.provs.framework.core.cli.retrievePassword +import org.domaindrivenarchitecture.provs.framework.core.remote import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/cli/TargetCliCommandTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/cli/TargetCliCommandTest.kt index 9bcdfef..6500aa5 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/cli/TargetCliCommandTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/cli/TargetCliCommandTest.kt @@ -1,5 +1,6 @@ package org.domaindrivenarchitecture.provs.core.cli +import org.domaindrivenarchitecture.provs.framework.core.cli.parseTarget import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/docker/platforms/UbuntuHostDockerKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/docker/platforms/UbuntuHostDockerKtTest.kt index 0eb70d7..9ab1ac6 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/docker/platforms/UbuntuHostDockerKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/docker/platforms/UbuntuHostDockerKtTest.kt @@ -1,9 +1,9 @@ package org.domaindrivenarchitecture.provs.core.docker.platforms -import org.domaindrivenarchitecture.provs.core.ProvResult -import org.domaindrivenarchitecture.provs.core.docker.containerRuns -import org.domaindrivenarchitecture.provs.core.docker.exitAndRmContainer -import org.domaindrivenarchitecture.provs.core.docker.runContainer +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.docker.containerRuns +import org.domaindrivenarchitecture.provs.framework.core.docker.exitAndRmContainer +import org.domaindrivenarchitecture.provs.framework.core.docker.runContainer import org.domaindrivenarchitecture.provs.test.tags.NonCi import org.domaindrivenarchitecture.provs.test.testLocal import org.junit.jupiter.api.Assertions.assertEquals diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/entry/EntryTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/entry/EntryTest.kt index fca7e30..a828132 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/entry/EntryTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/entry/EntryTest.kt @@ -41,7 +41,7 @@ internal class EntryKtTest { @Test fun test_without_method_argument() { // when - main("org.domaindrivenarchitecture.provs.core.entry.EntryTestKt") + org.domaindrivenarchitecture.provs.framework.core.entry.main("org.domaindrivenarchitecture.provs.core.entry.EntryTestKt") // then assertEquals("main is fun \n", outContent.toString()) @@ -50,7 +50,10 @@ internal class EntryKtTest { @Test fun test_method_main_without_args() { // when - main("org.domaindrivenarchitecture.provs.core.entry.EntryTestKt", "main") + org.domaindrivenarchitecture.provs.framework.core.entry.main( + "org.domaindrivenarchitecture.provs.core.entry.EntryTestKt", + "main" + ) // then assertEquals("main is fun \n", outContent.toString()) @@ -59,7 +62,10 @@ internal class EntryKtTest { @Test fun test_named_method_without_args() { // when - main("org.domaindrivenarchitecture.provs.core.entry.EntryTestKt", "testfun") + org.domaindrivenarchitecture.provs.framework.core.entry.main( + "org.domaindrivenarchitecture.provs.core.entry.EntryTestKt", + "testfun" + ) // then assertEquals("test is fun \n", outContent.toString()) @@ -68,7 +74,12 @@ internal class EntryKtTest { @Test fun test_method_main_with_args() { // when - main("org.domaindrivenarchitecture.provs.core.entry.EntryTestKt", "main", "arg1", "arg2") + org.domaindrivenarchitecture.provs.framework.core.entry.main( + "org.domaindrivenarchitecture.provs.core.entry.EntryTestKt", + "main", + "arg1", + "arg2" + ) // then assertEquals("main is fun arg1 arg2\n", outContent.toString()) @@ -77,7 +88,12 @@ internal class EntryKtTest { @Test fun test_named_method_with_args() { // when - main("org.domaindrivenarchitecture.provs.core.entry.EntryTestKt", "testfun", "arg1", "arg2") + org.domaindrivenarchitecture.provs.framework.core.entry.main( + "org.domaindrivenarchitecture.provs.core.entry.EntryTestKt", + "testfun", + "arg1", + "arg2" + ) // then assertEquals("test is fun arg1 arg2\n", outContent.toString()) diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/platformTest/UbuntuProvTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/platformTest/UbuntuProvTest.kt index 2b40dc1..ed4ae11 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/platformTest/UbuntuProvTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/platformTest/UbuntuProvTest.kt @@ -1,12 +1,12 @@ package org.domaindrivenarchitecture.provs.core.platformTest -import org.domaindrivenarchitecture.provs.core.ProgressType -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.docker.dockerImageExists -import org.domaindrivenarchitecture.provs.core.docker.dockerProvideImage -import org.domaindrivenarchitecture.provs.core.docker.dockerimages.DockerImage -import org.domaindrivenarchitecture.provs.core.processors.ContainerStartMode -import org.domaindrivenarchitecture.provs.core.processors.ContainerUbuntuHostProcessor +import org.domaindrivenarchitecture.provs.framework.core.ProgressType +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.docker.dockerImageExists +import org.domaindrivenarchitecture.provs.framework.core.docker.dockerProvideImage +import org.domaindrivenarchitecture.provs.framework.core.docker.dockerimages.DockerImage +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerStartMode +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerUbuntuHostProcessor import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.test.tags.NonCi import org.domaindrivenarchitecture.provs.test.testDockerWithSudo diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerProcessorTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerProcessorTest.kt index 5d88d1a..f1e53f0 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerProcessorTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerProcessorTest.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.core.processors -import org.domaindrivenarchitecture.provs.core.newline +import org.domaindrivenarchitecture.provs.framework.core.newline import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.junit.jupiter.api.Assertions.assertEquals diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerUbuntuHostProcessorTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerUbuntuHostProcessorTest.kt index f799f7d..21b106a 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerUbuntuHostProcessorTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerUbuntuHostProcessorTest.kt @@ -1,6 +1,8 @@ package org.domaindrivenarchitecture.provs.core.processors -import org.domaindrivenarchitecture.provs.core.platforms.SHELL +import org.domaindrivenarchitecture.provs.framework.core.platforms.SHELL +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerStartMode +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerUbuntuHostProcessor import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.test.testDockerWithSudo import org.junit.jupiter.api.Assertions.assertEquals diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/LocalProcessorTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/LocalProcessorTest.kt index 50bff43..ab94f52 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/LocalProcessorTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/LocalProcessorTest.kt @@ -1,9 +1,9 @@ package org.domaindrivenarchitecture.provs.core.processors -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.escapeAndEncloseByDoubleQuoteForShell -import org.domaindrivenarchitecture.provs.core.escapeProcentForPrintf -import org.domaindrivenarchitecture.provs.core.escapeSingleQuoteForShell +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.escapeAndEncloseByDoubleQuoteForShell +import org.domaindrivenarchitecture.provs.framework.core.escapeProcentForPrintf +import org.domaindrivenarchitecture.provs.framework.core.escapeSingleQuoteForShell import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3dKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3dKtTest.kt index d2297c9..899c2a7 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3dKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3dKtTest.kt @@ -1,10 +1,10 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain -import org.domaindrivenarchitecture.provs.core.docker -import org.domaindrivenarchitecture.provs.core.docker.containerExec -import org.domaindrivenarchitecture.provs.core.docker.provideContainer -import org.domaindrivenarchitecture.provs.core.local -import org.domaindrivenarchitecture.provs.core.processors.ContainerStartMode +import org.domaindrivenarchitecture.provs.framework.core.docker +import org.domaindrivenarchitecture.provs.framework.core.docker.containerExec +import org.domaindrivenarchitecture.provs.framework.core.docker.provideContainer +import org.domaindrivenarchitecture.provs.framework.core.local +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerStartMode import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.infrastructure.apple.appleConfig import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.infrastructure.apple.checkAppleService import org.domaindrivenarchitecture.provs.test.tags.ContainerTest diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewallKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewallKtTest.kt index 9c8d35d..99e45bf 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewallKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewallKtTest.kt @@ -1,13 +1,13 @@ package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.firewall -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.docker.dockerProvideImage -import org.domaindrivenarchitecture.provs.core.docker.dockerimages.UbuntuPlusUser -import org.domaindrivenarchitecture.provs.core.docker.exitAndRmContainer -import org.domaindrivenarchitecture.provs.core.local -import org.domaindrivenarchitecture.provs.core.processors.ContainerEndMode -import org.domaindrivenarchitecture.provs.core.processors.ContainerStartMode -import org.domaindrivenarchitecture.provs.core.processors.ContainerUbuntuHostProcessor +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.docker.dockerProvideImage +import org.domaindrivenarchitecture.provs.framework.core.docker.dockerimages.UbuntuPlusUser +import org.domaindrivenarchitecture.provs.framework.core.docker.exitAndRmContainer +import org.domaindrivenarchitecture.provs.framework.core.local +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerEndMode +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerStartMode +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerUbuntuHostProcessor import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.test.tags.NonCi import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassBridgeKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassBridgeKtTest.kt index 53eb597..a761eba 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassBridgeKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassBridgeKtTest.kt @@ -1,11 +1,11 @@ package org.domaindrivenarchitecture.provs.extensions.workplace.base -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.ProvResult -import org.domaindrivenarchitecture.provs.core.Secret -import org.domaindrivenarchitecture.provs.core.docker.exitAndRmContainer -import org.domaindrivenarchitecture.provs.core.local -import org.domaindrivenarchitecture.provs.core.processors.ContainerStartMode +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.ProvResult +import org.domaindrivenarchitecture.provs.framework.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.docker.exitAndRmContainer +import org.domaindrivenarchitecture.provs.framework.core.local +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerStartMode import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.test.tags.NonCi diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassKtTest.kt index 362006f..6b5e8d0 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassKtTest.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.extensions.workplace.base -import org.domaindrivenarchitecture.provs.core.Secret -import org.domaindrivenarchitecture.provs.core.remote +import org.domaindrivenarchitecture.provs.framework.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.remote import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.* diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/ProvisionKeysTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/ProvisionKeysTest.kt index 6717dcb..cba7886 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/ProvisionKeysTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/ProvisionKeysTest.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.ubuntu.keys -import org.domaindrivenarchitecture.provs.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.Secret import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/GpgKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/GpgKtTest.kt index f76e6e4..711c8d3 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/GpgKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/GpgKtTest.kt @@ -1,8 +1,8 @@ package org.domaindrivenarchitecture.provs.ubuntu.keys.base -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.Secret -import org.domaindrivenarchitecture.provs.core.processors.ContainerStartMode +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerStartMode import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/SshKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/SshKtTest.kt index 58fa7dd..60300ca 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/SshKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/SshKtTest.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.ubuntu.keys.base -import org.domaindrivenarchitecture.provs.core.Secret +import org.domaindrivenarchitecture.provs.framework.core.Secret import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.ubuntu.keys.* diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/utils/UtilsKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/utils/UtilsKtTest.kt index 0ace6af..765422a 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/utils/UtilsKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/utils/UtilsKtTest.kt @@ -1,8 +1,8 @@ package org.domaindrivenarchitecture.provs.ubuntu.utils -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.docker -import org.domaindrivenarchitecture.provs.core.echoCommandForText +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.docker +import org.domaindrivenarchitecture.provs.framework.core.echoCommandForText import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.test.tags.NonCi import org.junit.jupiter.api.Assertions.assertEquals diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceKtTest.kt index 141c1af..88eff05 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceKtTest.kt @@ -6,8 +6,9 @@ import io.mockk.mockkStatic import io.mockk.unmockkStatic import io.mockk.verify import org.domaindrivenarchitecture.provs.core.* -import org.domaindrivenarchitecture.provs.core.cli.retrievePassword -import org.domaindrivenarchitecture.provs.core.processors.PrintOnlyProcessor +import org.domaindrivenarchitecture.provs.framework.core.cli.retrievePassword +import org.domaindrivenarchitecture.provs.framework.core.processors.PrintOnlyProcessor +import org.domaindrivenarchitecture.provs.framework.core.* import org.domaindrivenarchitecture.provs.test.setRootLoggingLevel import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceConfig import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceType diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOpsKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOpsKtTest.kt index 786a5b2..72ea7d9 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOpsKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOpsKtTest.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure -import org.domaindrivenarchitecture.provs.core.getResourceAsText +import org.domaindrivenarchitecture.provs.framework.core.getResourceAsText import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir diff --git a/src/testFixtures/kotlin/org/domaindrivenarchitecture/provs/test/TestSetup.kt b/src/testFixtures/kotlin/org/domaindrivenarchitecture/provs/test/TestSetup.kt index 2016210..4ce00b1 100644 --- a/src/testFixtures/kotlin/org/domaindrivenarchitecture/provs/test/TestSetup.kt +++ b/src/testFixtures/kotlin/org/domaindrivenarchitecture/provs/test/TestSetup.kt @@ -1,12 +1,12 @@ package org.domaindrivenarchitecture.provs.test -import org.domaindrivenarchitecture.provs.core.ProgressType -import org.domaindrivenarchitecture.provs.core.Prov -import org.domaindrivenarchitecture.provs.core.docker.dockerImageExists -import org.domaindrivenarchitecture.provs.core.docker.dockerProvideImage -import org.domaindrivenarchitecture.provs.core.docker.dockerimages.UbuntuPlusUser -import org.domaindrivenarchitecture.provs.core.processors.ContainerStartMode -import org.domaindrivenarchitecture.provs.core.processors.ContainerUbuntuHostProcessor +import org.domaindrivenarchitecture.provs.framework.core.ProgressType +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.core.docker.dockerImageExists +import org.domaindrivenarchitecture.provs.framework.core.docker.dockerProvideImage +import org.domaindrivenarchitecture.provs.framework.core.docker.dockerimages.UbuntuPlusUser +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerStartMode +import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerUbuntuHostProcessor val testDockerWithSudo = ("true" != System.getProperty("testdockerwithoutsudo")?.lowercase())