From 1cdc05f352db4664d60c5786aa0742f12deddedf Mon Sep 17 00:00:00 2001 From: jem Date: Tue, 18 Jan 2022 19:57:18 +0100 Subject: [PATCH] refactor: ubuntu -> framework.ubuntu & extensions -> framework.extensions --- .../k3s/application/Application.kt | 13 ------------ .../prometheus/base/PrometheusNginxConfig.kt | 5 ----- .../provs/framework/core/Utils.kt | 2 +- .../provs/framework/core/cli/CliUtils.kt | 10 +++++----- .../extensions/demos/HelloWorld.kt | 2 +- .../extensions/demos/SystemInfos.kt | 2 +- .../k3s/application/Application.kt | 13 ++++++++++++ .../server_software/k3s/application/Cli.kt | 4 ++-- .../k3s/application/CliK3sArgumentsParser.kt | 2 +- .../k3s/application/CliK3sCommand.kt | 2 +- .../server_software/k3s/domain/K3d.kt | 2 +- .../server_software/k3s/domain/K3s.kt | 4 ++-- .../k3s/infrastructure/apple/Apple.kt | 6 +++--- .../certbot/ProvisionCertbot.kt | 6 +++--- .../firewall/ProvisionFirewall.kt | 4 ++-- .../firewall/base/FirewallBackup.kt | 2 +- .../standalone_server/nexus/ProvisionNexus.kt | 16 +++++++-------- .../standalone_server/nexus/base/NginxConf.kt | 2 +- .../standalone_server/nginx/ProvisionNginx.kt | 12 +++++------ .../standalone_server/nginx/base/BasicAuth.kt | 4 ++-- .../standalone_server/nginx/base/Configs.kt | 2 +- .../standalone_server/nginx/base/Locations.kt | 4 ++-- .../nginx/base/SelfSignedCertificate.kt | 6 +++--- .../prometheus/ProvisionPrometheus.kt | 4 ++-- .../prometheus/base/NodeExporter.kt | 14 ++++++------- .../prometheus/base/Prometheus.kt | 8 ++++---- .../prometheus/base/PrometheusNginxConfig.kt | 5 +++++ .../ubuntu/filesystem/base/Filesystem.kt | 2 +- .../ubuntu/git/ProvisionGit.kt | 4 ++-- .../{ => framework}/ubuntu/git/base/Git.kt | 6 +++--- .../ubuntu/install/base/Install.kt | 2 +- .../ubuntu/keys/ProvisionKeys.kt | 8 ++++---- .../{ => framework}/ubuntu/keys/base/Gpg.kt | 14 ++++++------- .../{ => framework}/ubuntu/keys/base/Ssh.kt | 8 ++++---- .../ubuntu/secret/SecretSource.kt | 4 ++-- .../secret/secretSources/FileSecretSource.kt | 4 ++-- .../secretSources/GopassSecretSource.kt | 4 ++-- .../secret/secretSources/PassSecretSource.kt | 4 ++-- .../secret/secretSources/PlainSecretSource.kt | 4 ++-- .../secretSources/PromptSecretSource.kt | 4 ++-- .../provs/framework/ubuntu/user/UserConfig.kt | 8 ++++++++ .../{ => framework}/ubuntu/user/base/User.kt | 16 +++++++-------- .../{ => framework}/ubuntu/web/base/Web.kt | 9 ++++----- .../provs/ubuntu/user/UserConfig.kt | 12 ----------- .../workplace/domain/ProvisionWorkplace.kt | 18 ++++++++--------- .../provs/workplace/domain/WorkplaceConfig.kt | 2 +- .../provs/workplace/infrastructure/Bash.kt | 6 ++++-- .../provs/workplace/infrastructure/DevOps.kt | 6 +++--- .../provs/workplace/infrastructure/Docker.kt | 2 +- .../workplace/infrastructure/Fakturama.kt | 4 ++-- .../provs/workplace/infrastructure/Gopass.kt | 11 ++++++---- .../workplace/infrastructure/GopassBridge.kt | 12 +++++------ .../workplace/infrastructure/NoSwappiness.kt | 2 +- .../provs/workplace/infrastructure/Python.kt | 2 +- .../workplace/infrastructure/Redshift.kt | 6 +++--- .../provs/workplace/infrastructure/VSCode.kt | 4 ++-- .../infrastructure/VirtualBoxGuest.kt | 4 ++-- .../provs/workplace/infrastructure/Zim.kt | 6 +++--- .../provs/{ => framework}/core/ProvTest.kt | 6 +----- .../core/TaskFunctionsKtTest.kt | 5 +---- .../provs/{ => framework}/core/UtilsKtTest.kt | 6 +----- .../core/cli/CliCommandKtTest.kt | 2 +- .../core/cli/TargetCliCommandTest.kt | 2 +- .../platforms/UbuntuHostDockerKtTest.kt | 2 +- .../{ => framework}/core/entry/EntryTest.kt | 2 +- .../core/platformTest/UbuntuProvTest.kt | 2 +- .../core/processors/ContainerProcessorTest.kt | 2 +- .../ContainerUbuntuHostProcessorTest.kt | 4 +--- .../core/processors/LocalProcessorTest.kt | 2 +- .../k3s/application/CliK3sCommandKtTest.kt | 3 +-- .../k3s/application/CliKtTest.kt | 2 +- .../server_software/k3s/domain/K3dKtTest.kt | 6 +++--- .../firewall/ProvisionFirewallKtTest.kt | 4 ++-- .../nexus/ProvisionNexusKtTest.kt | 2 +- .../nginx/ProvisionNginxKtTest.kt | 10 +++++----- .../nginx/base/LocationsKtTest.kt | 10 +++++----- .../extensions/test_keys}/TestKeys.kt | 2 +- .../workplace/ProvisionWorkplaceKtTest.kt | 2 +- .../workplace/base/FakturamaKtTest.kt | 2 +- .../workplace/base/GopassBridgeKtTest.kt | 12 +++++------ .../extensions/workplace/base/GopassKtTest.kt | 18 ++++++++--------- .../extensions/workplace/base/VSCodeKtTest.kt | 4 ++-- .../filesystem/base/FilesystemKtTest.kt | 2 +- .../ubuntu/git/base/GitKtTest.kt | 9 ++++++--- .../ubuntu/install/base/InstallKtTest.kt | 4 +++- .../ubuntu/keys/ProvisionKeysTest.kt | 2 +- .../ubuntu/keys}/TestKeys.kt | 2 +- .../ubuntu/keys/base/GpgKtTest.kt | 12 +++++------ .../ubuntu/keys/base/SshKtTest.kt | 6 ++++-- .../secretSources/PromptSecretSourceTest.kt | 3 ++- .../ubuntu/user/ProvisionUserKtTest.kt | 20 +++++++++---------- .../ubuntu/utils/UtilsKtTest.kt | 2 +- .../ubuntu/web/base/WebKtTest.kt | 9 +++++---- .../application/CliWorkplaceKtTest.kt | 2 +- .../infrastructure/ConfigRepositoryKtTest.kt | 2 +- .../workplace/infrastructure/DevOpsKtTest.kt | 6 +++--- .../workplace/infrastructure/VSCodeKtTest.kt | 2 +- 97 files changed, 271 insertions(+), 278 deletions(-) delete mode 100644 src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/Application.kt delete mode 100644 src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/PrometheusNginxConfig.kt rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/demos/HelloWorld.kt (76%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/demos/SystemInfos.kt (95%) create mode 100644 src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Application.kt rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/k3s/application/Cli.kt (79%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/k3s/application/CliK3sArgumentsParser.kt (81%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/k3s/application/CliK3sCommand.kt (90%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/k3s/domain/K3d.kt (95%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/k3s/domain/K3s.kt (89%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/k3s/infrastructure/apple/Apple.kt (85%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/certbot/ProvisionCertbot.kt (78%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/firewall/ProvisionFirewall.kt (96%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/firewall/base/FirewallBackup.kt (86%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt (78%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/nexus/base/NginxConf.kt (95%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt (65%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/nginx/base/BasicAuth.kt (65%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/nginx/base/Configs.kt (97%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/nginx/base/Locations.kt (89%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/nginx/base/SelfSignedCertificate.kt (80%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/prometheus/ProvisionPrometheus.kt (73%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/prometheus/base/NodeExporter.kt (78%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/prometheus/base/Prometheus.kt (87%) create mode 100644 src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/prometheus/base/PrometheusNginxConfig.kt rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/filesystem/base/Filesystem.kt (99%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/git/ProvisionGit.kt (81%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/git/base/Git.kt (95%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/install/base/Install.kt (96%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/keys/ProvisionKeys.kt (73%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/keys/base/Gpg.kt (80%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/keys/base/Ssh.kt (77%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/secret/SecretSource.kt (86%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/secret/secretSources/FileSecretSource.kt (78%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/secret/secretSources/GopassSecretSource.kt (77%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/secret/secretSources/PassSecretSource.kt (78%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/secret/secretSources/PlainSecretSource.kt (64%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/secret/secretSources/PromptSecretSource.kt (91%) create mode 100644 src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/UserConfig.kt rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/user/base/User.kt (89%) rename src/main/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/web/base/Web.kt (80%) delete mode 100644 src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/UserConfig.kt rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/core/ProvTest.kt (97%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/core/TaskFunctionsKtTest.kt (75%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/core/UtilsKtTest.kt (83%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/core/cli/CliCommandKtTest.kt (97%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/core/cli/TargetCliCommandTest.kt (97%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/core/docker/platforms/UbuntuHostDockerKtTest.kt (93%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/core/entry/EntryTest.kt (97%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/core/platformTest/UbuntuProvTest.kt (98%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/core/processors/ContainerProcessorTest.kt (94%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/core/processors/ContainerUbuntuHostProcessorTest.kt (77%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/core/processors/LocalProcessorTest.kt (96%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/k3s/application/CliK3sCommandKtTest.kt (92%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/k3s/application/CliKtTest.kt (73%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/k3s/domain/K3dKtTest.kt (87%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/firewall/ProvisionFirewallKtTest.kt (90%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/nexus/ProvisionNexusKtTest.kt (81%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/nginx/ProvisionNginxKtTest.kt (82%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/server_software/standalone_server/nginx/base/LocationsKtTest.kt (66%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ubuntu/keys => framework/extensions/test_keys}/TestKeys.kt (99%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/workplace/ProvisionWorkplaceKtTest.kt (95%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/workplace/base/FakturamaKtTest.kt (87%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/workplace/base/GopassBridgeKtTest.kt (90%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/workplace/base/GopassKtTest.kt (81%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/extensions/workplace/base/VSCodeKtTest.kt (81%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/filesystem/base/FilesystemKtTest.kt (98%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/git/base/GitKtTest.kt (72%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/install/base/InstallKtTest.kt (79%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/keys/ProvisionKeysTest.kt (91%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{extensions/test_keys => framework/ubuntu/keys}/TestKeys.kt (99%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/keys/base/GpgKtTest.kt (80%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/keys/base/SshKtTest.kt (65%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/secret/secretSources/PromptSecretSourceTest.kt (57%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/user/ProvisionUserKtTest.kt (73%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/utils/UtilsKtTest.kt (97%) rename src/test/kotlin/org/domaindrivenarchitecture/provs/{ => framework}/ubuntu/web/base/WebKtTest.kt (82%) 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 deleted file mode 100644 index 47bd270..0000000 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/Application.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application - -import org.domaindrivenarchitecture.provs.framework.core.Prov -import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain.installK3sServer - - -/** - * Performs use case of provisioning a k3s server - */ -fun Prov.provisionK3s() = task { - installK3sServer() -} - diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/PrometheusNginxConfig.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/PrometheusNginxConfig.kt deleted file mode 100644 index 41962e6..0000000 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/PrometheusNginxConfig.kt +++ /dev/null @@ -1,5 +0,0 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base - -val prometheusNginxConfig = """ - proxy_pass http://localhost:9090/prometheus; -""" \ No newline at end of file diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Utils.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Utils.kt index dad937b..f807a28 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Utils.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Utils.kt @@ -5,7 +5,7 @@ import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerSta 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 org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContent import java.io.File import java.net.InetAddress diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliUtils.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliUtils.kt index 37145cc..ccad647 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliUtils.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliUtils.kt @@ -4,11 +4,11 @@ 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 -import org.domaindrivenarchitecture.provs.ubuntu.user.base.makeUserSudoerWithNoSudoPasswordRequired -import org.domaindrivenarchitecture.provs.ubuntu.user.base.whoami +import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources.GopassSecretSource +import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources.PromptSecretSource +import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.currentUserCanSudo +import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.makeUserSudoerWithNoSudoPasswordRequired +import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.whoami import kotlin.system.exitProcess diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/demos/HelloWorld.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/demos/HelloWorld.kt similarity index 76% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/demos/HelloWorld.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/demos/HelloWorld.kt index c46fdce..864f350 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/demos/HelloWorld.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/demos/HelloWorld.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.extensions.demos +package org.domaindrivenarchitecture.provs.framework.extensions.demos import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.local diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/demos/SystemInfos.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/demos/SystemInfos.kt similarity index 95% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/demos/SystemInfos.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/demos/SystemInfos.kt index c498989..47b4456 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/demos/SystemInfos.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/demos/SystemInfos.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.extensions.demos +package org.domaindrivenarchitecture.provs.framework.extensions.demos import org.domaindrivenarchitecture.provs.framework.core.* diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Application.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Application.kt new file mode 100644 index 0000000..84bfe63 --- /dev/null +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Application.kt @@ -0,0 +1,13 @@ +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application + +import org.domaindrivenarchitecture.provs.framework.core.Prov +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain.installK3sServer + + +/** + * Performs use case of provisioning a k3s server + */ +fun Prov.provisionK3s() = task { + installK3sServer() +} + diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/Cli.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Cli.kt similarity index 79% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/Cli.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Cli.kt index 23eebf5..30422d2 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/Cli.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Cli.kt @@ -1,7 +1,7 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application import org.domaindrivenarchitecture.provs.framework.core.cli.createProvInstance -import org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain.installK3sAsContainers +import org.domaindrivenarchitecture.provs.framework.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/framework/extensions/server_software/k3s/application/CliK3sArgumentsParser.kt similarity index 81% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sArgumentsParser.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sArgumentsParser.kt index e1e3729..5ec7138 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sArgumentsParser.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sArgumentsParser.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application import kotlinx.cli.ArgType import kotlinx.cli.default diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sCommand.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sCommand.kt similarity index 90% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sCommand.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sCommand.kt index 4c88870..6aeafd5 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sCommand.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sCommand.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application import org.domaindrivenarchitecture.provs.framework.core.cli.TargetCliCommand diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3d.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3d.kt similarity index 95% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3d.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3d.kt index 6150d03..6e0799a 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3d.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3d.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.docker.provideContainer diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3s.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3s.kt similarity index 89% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3s.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3s.kt index de4932d..09869a4 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3s.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3s.kt @@ -1,9 +1,9 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain 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 +import org.domaindrivenarchitecture.provs.framework.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/framework/extensions/server_software/k3s/infrastructure/apple/Apple.kt similarity index 85% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/infrastructure/apple/Apple.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/infrastructure/apple/Apple.kt index d3cac17..42e7f73 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/infrastructure/apple/Apple.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/infrastructure/apple/Apple.kt @@ -1,11 +1,11 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.infrastructure.apple +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.infrastructure.apple 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 +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain.applyK3sConfig +import org.domaindrivenarchitecture.provs.framework.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/framework/extensions/server_software/standalone_server/certbot/ProvisionCertbot.kt similarity index 78% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/certbot/ProvisionCertbot.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/certbot/ProvisionCertbot.kt index 236e72e..a610ceb 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/certbot/ProvisionCertbot.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/certbot/ProvisionCertbot.kt @@ -1,9 +1,9 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.certbot +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.certbot 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 +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileExists +import org.domaindrivenarchitecture.provs.framework.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/framework/extensions/server_software/standalone_server/firewall/ProvisionFirewall.kt similarity index 96% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewall.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/firewall/ProvisionFirewall.kt index b61807d..33456ce 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewall.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/firewall/ProvisionFirewall.kt @@ -1,8 +1,8 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.firewall +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.firewall 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.framework.ubuntu.install.base.aptInstall fun Prov.saveIpTables() = requireAll { 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/framework/extensions/server_software/standalone_server/firewall/base/FirewallBackup.kt similarity index 86% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/base/FirewallBackup.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/firewall/base/FirewallBackup.kt index bbf225c..21aace3 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/base/FirewallBackup.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/firewall/base/FirewallBackup.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.firewall.base +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.firewall.base import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.ProvResult diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt similarity index 78% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt index 3013fe2..fc9ab33 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nexus/ProvisionNexus.kt @@ -1,16 +1,16 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nexus +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nexus 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 -import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.certbot.provisionCertbot -import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.NginxConf -import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.nginxReverseProxyHttpConfig -import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileExists +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.createUser +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.certbot.provisionCertbot +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base.NginxConf +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base.nginxReverseProxyHttpConfig +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone /** diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/base/NginxConf.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nexus/base/NginxConf.kt similarity index 95% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/base/NginxConf.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nexus/base/NginxConf.kt index 3193321..715f2f2 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/base/NginxConf.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nexus/base/NginxConf.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nexus.base +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nexus.base fun reverseProxyConfigHttpPort80(serverName: String): String { // see https://help.sonatype.com/repomanager3/installation/run-behind-a-reverse-proxy diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt similarity index 65% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt index 3468602..6e7632c 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/ProvisionNginx.kt @@ -1,13 +1,13 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx 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 -import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.NginxConf -import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.createNginxLocationFolders +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileExists +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base.NginxConf +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base.createNginxLocationFolders import kotlin.system.exitProcess 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/framework/extensions/server_software/standalone_server/nginx/base/BasicAuth.kt similarity index 65% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/BasicAuth.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/BasicAuth.kt index 9532cbf..7b20fb0 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/BasicAuth.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/BasicAuth.kt @@ -1,8 +1,8 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.Secret -import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall fun Prov.nginxAddBasicAuth(user: String, password: Secret) = requireAll { aptInstall("apache2-utils") diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Configs.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/Configs.kt similarity index 97% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Configs.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/Configs.kt index e5bc0b2..22f007c 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Configs.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/Configs.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base class NginxConf(val conf: String = NGINX_MINIMAL_CONF) { companion object {} 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/framework/extensions/server_software/standalone_server/nginx/base/Locations.kt similarity index 89% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Locations.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/Locations.kt index d037617..3919ce1 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/Locations.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/Locations.kt @@ -1,8 +1,8 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base 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.framework.ubuntu.filesystem.base.* internal const val locationsAvailableDir = "/etc/nginx/locations-available/" 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/framework/extensions/server_software/standalone_server/nginx/base/SelfSignedCertificate.kt similarity index 80% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/SelfSignedCertificate.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/SelfSignedCertificate.kt index a15c2d6..cec576d 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/SelfSignedCertificate.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/SelfSignedCertificate.kt @@ -1,8 +1,8 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base 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 +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone internal val certificateName = "selfsigned" diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/ProvisionPrometheus.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/prometheus/ProvisionPrometheus.kt similarity index 73% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/ProvisionPrometheus.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/prometheus/ProvisionPrometheus.kt index f3dc068..28a94ac 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/ProvisionPrometheus.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/prometheus/ProvisionPrometheus.kt @@ -1,7 +1,7 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.prometheus import org.domaindrivenarchitecture.provs.framework.core.Prov -import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base.* +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.prometheus.base.* /** * Provisions prometheus monitoring. 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/framework/extensions/server_software/standalone_server/prometheus/base/NodeExporter.kt similarity index 78% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/NodeExporter.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/prometheus/base/NodeExporter.kt index 7b33916..fed0986 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/NodeExporter.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/prometheus/base/NodeExporter.kt @@ -1,12 +1,12 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.prometheus.base 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 -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.replaceTextInFile -import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall -import org.domaindrivenarchitecture.provs.ubuntu.user.base.whoami +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContainsText +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.replaceTextInFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.whoami internal val defaultInstallationDir = "/usr/local/bin/" 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/framework/extensions/server_software/standalone_server/prometheus/base/Prometheus.kt similarity index 87% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/Prometheus.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/prometheus/base/Prometheus.kt index 17d292b..95496f2 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/prometheus/base/Prometheus.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/prometheus/base/Prometheus.kt @@ -1,10 +1,10 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.prometheus.base +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.prometheus.base 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 +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall internal val configDir = "/etc/prometheus/" diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/prometheus/base/PrometheusNginxConfig.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/prometheus/base/PrometheusNginxConfig.kt new file mode 100644 index 0000000..074da96 --- /dev/null +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/prometheus/base/PrometheusNginxConfig.kt @@ -0,0 +1,5 @@ +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.prometheus.base + +val prometheusNginxConfig = """ + proxy_pass http://localhost:9090/prometheus; +""" \ No newline at end of file diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/filesystem/base/Filesystem.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/filesystem/base/Filesystem.kt similarity index 99% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/filesystem/base/Filesystem.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/filesystem/base/Filesystem.kt index 138ec15..d4f1de3 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/filesystem/base/Filesystem.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/filesystem/base/Filesystem.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.ubuntu.filesystem.base +package org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base import org.domaindrivenarchitecture.provs.framework.core.platforms.SHELL import org.domaindrivenarchitecture.provs.framework.core.* diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/ProvisionGit.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/ProvisionGit.kt similarity index 81% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/ProvisionGit.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/ProvisionGit.kt index e292d9f..6e13668 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/ProvisionGit.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/ProvisionGit.kt @@ -1,8 +1,8 @@ -package org.domaindrivenarchitecture.provs.ubuntu.git +package org.domaindrivenarchitecture.provs.framework.ubuntu.git 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.framework.ubuntu.install.base.aptInstall fun Prov.provisionGit( diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/base/Git.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/Git.kt similarity index 95% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/base/Git.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/Git.kt index 3bb51a6..b74ca3d 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/base/Git.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/Git.kt @@ -1,10 +1,10 @@ -package org.domaindrivenarchitecture.provs.ubuntu.git.base +package org.domaindrivenarchitecture.provs.framework.ubuntu.git.base 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.framework.ubuntu.keys.base.isHostKnown import org.domaindrivenarchitecture.provs.framework.core.echoCommandForText +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.* 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/framework/ubuntu/install/base/Install.kt similarity index 96% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/install/base/Install.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/Install.kt index ec6a546..71d13ad 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/install/base/Install.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/Install.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.ubuntu.install.base +package org.domaindrivenarchitecture.provs.framework.ubuntu.install.base import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.ProvResult diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/ProvisionKeys.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/ProvisionKeys.kt similarity index 73% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/ProvisionKeys.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/ProvisionKeys.kt index 24e153d..e15ca70 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/ProvisionKeys.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/ProvisionKeys.kt @@ -1,11 +1,11 @@ -package org.domaindrivenarchitecture.provs.ubuntu.keys +package org.domaindrivenarchitecture.provs.framework.ubuntu.keys 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 +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.configureGpgKeys +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.configureSshKeys +import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSourceType import kotlinx.serialization.Serializable diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/Gpg.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/Gpg.kt similarity index 80% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/Gpg.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/Gpg.kt index a7ce4f8..fa5b168 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/Gpg.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/Gpg.kt @@ -1,13 +1,13 @@ -package org.domaindrivenarchitecture.provs.ubuntu.keys.base +package org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base 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.framework.ubuntu.filesystem.base.createDir +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createSecretFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.dirExists +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPair 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/framework/ubuntu/keys/base/Ssh.kt similarity index 77% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/Ssh.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/Ssh.kt index ff5af78..7925769 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/Ssh.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/Ssh.kt @@ -1,10 +1,10 @@ -package org.domaindrivenarchitecture.provs.ubuntu.keys.base +package org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base 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 +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createSecretFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPair /** diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/SecretSource.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/SecretSource.kt similarity index 86% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/SecretSource.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/SecretSource.kt index e49fb67..dc491e7 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/SecretSource.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/SecretSource.kt @@ -1,8 +1,8 @@ -package org.domaindrivenarchitecture.provs.ubuntu.secret +package org.domaindrivenarchitecture.provs.framework.ubuntu.secret import org.domaindrivenarchitecture.provs.framework.core.Secret -import org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources.* import kotlinx.serialization.Serializable +import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources.* @Serializable diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/FileSecretSource.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/FileSecretSource.kt similarity index 78% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/FileSecretSource.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/FileSecretSource.kt index a43ffa6..a764199 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/FileSecretSource.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/FileSecretSource.kt @@ -1,8 +1,8 @@ -package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources +package org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.Secret -import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource +import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSource /** diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/GopassSecretSource.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/GopassSecretSource.kt similarity index 77% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/GopassSecretSource.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/GopassSecretSource.kt index 880be5c..5a6cb76 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/GopassSecretSource.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/GopassSecretSource.kt @@ -1,8 +1,8 @@ -package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources +package org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.Secret -import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource +import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSource /** diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PassSecretSource.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PassSecretSource.kt similarity index 78% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PassSecretSource.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PassSecretSource.kt index 350f331..fade282 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PassSecretSource.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PassSecretSource.kt @@ -1,8 +1,8 @@ -package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources +package org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.Secret -import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource +import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSource /** diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PlainSecretSource.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PlainSecretSource.kt similarity index 64% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PlainSecretSource.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PlainSecretSource.kt index ff51249..0e4bffd 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PlainSecretSource.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PlainSecretSource.kt @@ -1,7 +1,7 @@ -package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources +package org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources import org.domaindrivenarchitecture.provs.framework.core.Secret -import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource +import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSource class PlainSecretSource(plainSecret: String) : SecretSource(plainSecret) { diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PromptSecretSource.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PromptSecretSource.kt similarity index 91% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PromptSecretSource.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PromptSecretSource.kt index 13f4bd3..bbb9919 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PromptSecretSource.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PromptSecretSource.kt @@ -1,7 +1,7 @@ -package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources +package org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources import org.domaindrivenarchitecture.provs.framework.core.Secret -import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSource +import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSource import java.awt.FlowLayout import javax.swing.* diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/UserConfig.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/UserConfig.kt new file mode 100644 index 0000000..e841ca6 --- /dev/null +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/UserConfig.kt @@ -0,0 +1,8 @@ +package org.domaindrivenarchitecture.provs.framework.ubuntu.user + +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPairSource +import kotlinx.serialization.Serializable + + +@Serializable +class UserConfig(val userName: String, val gitEmail: String? = null, val gpg: KeyPairSource? = null, val ssh: KeyPairSource? = null) diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/base/User.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/base/User.kt similarity index 89% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/base/User.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/base/User.kt index a3dd784..7e9a464 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/base/User.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/base/User.kt @@ -1,16 +1,16 @@ -package org.domaindrivenarchitecture.provs.ubuntu.user.base +package org.domaindrivenarchitecture.provs.framework.ubuntu.user.base 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 -import org.domaindrivenarchitecture.provs.ubuntu.git.provisionGit -import org.domaindrivenarchitecture.provs.ubuntu.keys.base.gpgFingerprint -import org.domaindrivenarchitecture.provs.ubuntu.keys.provisionKeys -import org.domaindrivenarchitecture.provs.ubuntu.user.UserConfig +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileExists +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.userHome +import org.domaindrivenarchitecture.provs.framework.ubuntu.git.provisionGit +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.gpgFingerprint +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.provisionKeys +import org.domaindrivenarchitecture.provs.framework.ubuntu.user.UserConfig import java.net.InetAddress diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/web/base/Web.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/web/base/Web.kt similarity index 80% rename from src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/web/base/Web.kt rename to src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/web/base/Web.kt index b1153b6..e7adb31 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/web/base/Web.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/web/base/Web.kt @@ -1,12 +1,11 @@ -package org.domaindrivenarchitecture.provs.ubuntu.web.base +package org.domaindrivenarchitecture.provs.framework.ubuntu.web.base 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 -import org.domaindrivenarchitecture.provs.ubuntu.install.base.isPackageInstalled +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.deleteFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall /** diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/UserConfig.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/UserConfig.kt deleted file mode 100644 index 236b239..0000000 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/UserConfig.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.domaindrivenarchitecture.provs.ubuntu.user - -import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPairSource -import kotlinx.serialization.Serializable -import kotlinx.serialization.json.Json -import java.io.BufferedReader -import java.io.FileReader -import java.io.FileWriter - - -@Serializable -class UserConfig(val userName: String, val gitEmail: String? = null, val gpg: KeyPairSource? = null, val ssh: KeyPairSource? = null) 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 a1fcba0..bba2c68 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/ProvisionWorkplace.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/ProvisionWorkplace.kt @@ -2,15 +2,15 @@ package org.domaindrivenarchitecture.provs.workplace.domain 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 -import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptPurge -import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPair -import org.domaindrivenarchitecture.provs.ubuntu.keys.base.gpgFingerprint -import org.domaindrivenarchitecture.provs.ubuntu.keys.provisionKeys -import org.domaindrivenarchitecture.provs.ubuntu.user.base.currentUserCanSudo -import org.domaindrivenarchitecture.provs.ubuntu.user.base.whoami +import org.domaindrivenarchitecture.provs.framework.ubuntu.git.provisionGit +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstallFromPpa +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptPurge +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPair +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.gpgFingerprint +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.provisionKeys +import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.currentUserCanSudo +import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.whoami import org.domaindrivenarchitecture.provs.workplace.infrastructure.* diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/WorkplaceConfig.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/WorkplaceConfig.kt index ed46535..839ed7b 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/WorkplaceConfig.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/WorkplaceConfig.kt @@ -1,6 +1,6 @@ package org.domaindrivenarchitecture.provs.workplace.domain -import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPairSource +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPairSource import kotlinx.serialization.Serializable 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 39fedd7..28bfdb4 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Bash.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Bash.kt @@ -2,8 +2,10 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure 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.framework.ubuntu.filesystem.base.addTextToFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.dirExists +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall import java.io.File 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 5c5364e..abcc81c 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOps.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOps.kt @@ -3,9 +3,9 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure 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 +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.* +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFromURL fun Prov.installDevOps() = def { 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 3c6c8ec..943baaf 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Docker.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Docker.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure import org.domaindrivenarchitecture.provs.framework.core.Prov -import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall fun Prov.installDocker() = def { aptInstall("containerd docker.io") 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 4695bf4..6888dfa 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Fakturama.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Fakturama.kt @@ -1,8 +1,8 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure import org.domaindrivenarchitecture.provs.framework.core.Prov -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir -import org.domaindrivenarchitecture.provs.ubuntu.web.base.downloadFromURL +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir +import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFromURL fun Prov.installFakturama() = def { 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 732c7ef..0aafbf3 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Gopass.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Gopass.kt @@ -2,10 +2,13 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure 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 -import org.domaindrivenarchitecture.provs.ubuntu.web.base.downloadFromURL +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.userHome +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.isPackageInstalled +import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFromURL fun Prov.installGopass( 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 2137235..79a0009 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/GopassBridge.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/GopassBridge.kt @@ -2,12 +2,12 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure 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 -import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall -import org.domaindrivenarchitecture.provs.ubuntu.install.base.isPackageInstalled -import org.domaindrivenarchitecture.provs.ubuntu.web.base.downloadFromURL +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.userHome +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.isPackageInstalled +import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFromURL fun Prov.downloadGopassBridge() = def { 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 7ddaa40..4790a63 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/NoSwappiness.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/NoSwappiness.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure import org.domaindrivenarchitecture.provs.framework.core.Prov -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.addTextToFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.addTextToFile import java.io.File fun Prov.configureNoSwappiness() = def { 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 716e8b8..66500f4 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Python.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Python.kt @@ -2,7 +2,7 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure 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.framework.ubuntu.install.base.aptInstall fun Prov.installPython() = def { 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 42c0508..e30ade7 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Redshift.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Redshift.kt @@ -1,9 +1,9 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure 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 +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall fun Prov.installRedshift() = def { 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 481306c..299d661 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCode.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCode.kt @@ -2,8 +2,8 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure 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 +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.isPackageInstalled fun Prov.installVSC(vararg options: String) = requireAll { 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 2d11890..8fa4e53 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VirtualBoxGuest.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VirtualBoxGuest.kt @@ -2,8 +2,8 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure 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 +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.whoami fun Prov.installVirtualBoxGuestAdditions() = def { // if running in a VirtualBox vm 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 72e9724..745d0f2 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Zim.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/Zim.kt @@ -2,9 +2,9 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure 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 +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstallFromPpa +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.isPackageInstalled fun Prov.installZimWiki() = def { diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/ProvTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/ProvTest.kt similarity index 97% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/core/ProvTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/ProvTest.kt index e5d5daf..3eedf98 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/ProvTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/ProvTest.kt @@ -1,11 +1,7 @@ -package org.domaindrivenarchitecture.provs.core +package org.domaindrivenarchitecture.provs.framework.core import ch.qos.logback.classic.Level 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/framework/core/TaskFunctionsKtTest.kt similarity index 75% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/core/TaskFunctionsKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/TaskFunctionsKtTest.kt index e04b092..a75bc0e 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/TaskFunctionsKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/TaskFunctionsKtTest.kt @@ -1,8 +1,5 @@ -package org.domaindrivenarchitecture.provs.core +package org.domaindrivenarchitecture.provs.framework.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/framework/core/UtilsKtTest.kt similarity index 83% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/core/UtilsKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/UtilsKtTest.kt index 71ad03f..34c8e18 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/UtilsKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/UtilsKtTest.kt @@ -1,9 +1,5 @@ -package org.domaindrivenarchitecture.provs.core +package org.domaindrivenarchitecture.provs.framework.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/framework/core/cli/CliCommandKtTest.kt similarity index 97% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliCommandKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliCommandKtTest.kt index 83be896..845551f 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/cli/CliCommandKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/CliCommandKtTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core.cli +package org.domaindrivenarchitecture.provs.framework.core.cli import io.mockk.every import io.mockk.mockkStatic diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/cli/TargetCliCommandTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/TargetCliCommandTest.kt similarity index 97% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/core/cli/TargetCliCommandTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/TargetCliCommandTest.kt index 6500aa5..1c79e12 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/cli/TargetCliCommandTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/cli/TargetCliCommandTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core.cli +package org.domaindrivenarchitecture.provs.framework.core.cli import org.domaindrivenarchitecture.provs.framework.core.cli.parseTarget import org.junit.jupiter.api.Assertions.* diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/docker/platforms/UbuntuHostDockerKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/platforms/UbuntuHostDockerKtTest.kt similarity index 93% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/core/docker/platforms/UbuntuHostDockerKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/platforms/UbuntuHostDockerKtTest.kt index 9ab1ac6..44de8d2 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/docker/platforms/UbuntuHostDockerKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/docker/platforms/UbuntuHostDockerKtTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core.docker.platforms +package org.domaindrivenarchitecture.provs.framework.core.docker.platforms import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.framework.core.docker.containerRuns diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/entry/EntryTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/entry/EntryTest.kt similarity index 97% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/core/entry/EntryTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/entry/EntryTest.kt index a828132..668a906 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/entry/EntryTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/entry/EntryTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core.entry +package org.domaindrivenarchitecture.provs.framework.core.entry import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/platformTest/UbuntuProvTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/platformTest/UbuntuProvTest.kt similarity index 98% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/core/platformTest/UbuntuProvTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/platformTest/UbuntuProvTest.kt index ed4ae11..5272d14 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/platformTest/UbuntuProvTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/platformTest/UbuntuProvTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core.platformTest +package org.domaindrivenarchitecture.provs.framework.core.platformTest import org.domaindrivenarchitecture.provs.framework.core.ProgressType import org.domaindrivenarchitecture.provs.framework.core.Prov diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerProcessorTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerProcessorTest.kt similarity index 94% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerProcessorTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerProcessorTest.kt index f1e53f0..e95c249 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerProcessorTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerProcessorTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core.processors +package org.domaindrivenarchitecture.provs.framework.core.processors import org.domaindrivenarchitecture.provs.framework.core.newline import org.domaindrivenarchitecture.provs.test.defaultTestContainer diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerUbuntuHostProcessorTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerUbuntuHostProcessorTest.kt similarity index 77% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerUbuntuHostProcessorTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerUbuntuHostProcessorTest.kt index 21b106a..a50b311 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/ContainerUbuntuHostProcessorTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/ContainerUbuntuHostProcessorTest.kt @@ -1,8 +1,6 @@ -package org.domaindrivenarchitecture.provs.core.processors +package org.domaindrivenarchitecture.provs.framework.core.processors 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/framework/core/processors/LocalProcessorTest.kt similarity index 96% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/LocalProcessorTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/LocalProcessorTest.kt index ab94f52..eb0b191 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/core/processors/LocalProcessorTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/LocalProcessorTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.core.processors +package org.domaindrivenarchitecture.provs.framework.core.processors import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.escapeAndEncloseByDoubleQuoteForShell diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sCommandKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sCommandKtTest.kt similarity index 92% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sCommandKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sCommandKtTest.kt index e0334a4..192392f 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliK3sCommandKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliK3sCommandKtTest.kt @@ -1,7 +1,6 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application import org.junit.jupiter.api.Test - import org.junit.jupiter.api.Assertions.* internal class CliK3sCommandKtTest { diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliKtTest.kt similarity index 73% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliKtTest.kt index c8f8ba9..a01b3a9 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/application/CliKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/CliKtTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.application +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application import org.junit.jupiter.api.Disabled 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/framework/extensions/server_software/k3s/domain/K3dKtTest.kt similarity index 87% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3dKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3dKtTest.kt index 899c2a7..e43e9a3 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/k3s/domain/K3dKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/domain/K3dKtTest.kt @@ -1,12 +1,12 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.k3s.domain +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain 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.framework.extensions.server_software.k3s.infrastructure.apple.appleConfig +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.infrastructure.apple.checkAppleService import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.test.tags.NonCi import org.junit.jupiter.api.Assertions.assertTrue diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewallKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/firewall/ProvisionFirewallKtTest.kt similarity index 90% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewallKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/firewall/ProvisionFirewallKtTest.kt index 99e45bf..0f36708 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/firewall/ProvisionFirewallKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/firewall/ProvisionFirewallKtTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.firewall +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.firewall import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.docker.dockerProvideImage @@ -10,7 +10,7 @@ import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerSta 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 +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall 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/standalone_server/nexus/ProvisionNexusKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nexus/ProvisionNexusKtTest.kt similarity index 81% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexusKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nexus/ProvisionNexusKtTest.kt index fe8f95b..75876cd 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nexus/ProvisionNexusKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nexus/ProvisionNexusKtTest.kt @@ -1,7 +1,7 @@ package nexus import org.domaindrivenarchitecture.provs.test.defaultTestContainer -import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nexus.provisionNexusWithDocker +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nexus.provisionNexusWithDocker import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginxKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/ProvisionNginxKtTest.kt similarity index 82% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginxKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/ProvisionNginxKtTest.kt index 7bcb060..70e2317 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/ProvisionNginxKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/ProvisionNginxKtTest.kt @@ -1,12 +1,12 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.NonCi -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.replaceTextInFile -import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall -import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base.* +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.replaceTextInFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base.* import org.domaindrivenarchitecture.provs.test.tags.ContainerTest -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileExists 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/standalone_server/nginx/base/LocationsKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/LocationsKtTest.kt similarity index 66% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/LocationsKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/LocationsKtTest.kt index 9d8b4a0..19ba579 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/server_software/standalone_server/nginx/base/LocationsKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/standalone_server/nginx/base/LocationsKtTest.kt @@ -1,9 +1,9 @@ -package org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.base +package org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.base -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileContainsText -import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.configFile -import org.domaindrivenarchitecture.provs.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContainsText +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.configFile +import org.domaindrivenarchitecture.provs.framework.extensions.server_software.standalone_server.nginx.provisionNginxStandAlone 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/ubuntu/keys/TestKeys.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/test_keys/TestKeys.kt similarity index 99% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/TestKeys.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/test_keys/TestKeys.kt index 1140588..591f2c5 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/TestKeys.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/test_keys/TestKeys.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.ubuntu.keys +package org.domaindrivenarchitecture.provs.framework.extensions.test_keys fun publicGPGSnakeoilKey(): String { diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplaceKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/ProvisionWorkplaceKtTest.kt similarity index 95% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplaceKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/ProvisionWorkplaceKtTest.kt index 0fb7db7..c6dc180 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/ProvisionWorkplaceKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/ProvisionWorkplaceKtTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.extensions.workplace +package org.domaindrivenarchitecture.provs.framework.extensions.workplace import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/FakturamaKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/FakturamaKtTest.kt similarity index 87% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/FakturamaKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/FakturamaKtTest.kt index 43ae296..771eabd 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/FakturamaKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/FakturamaKtTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.extensions.workplace.base +package org.domaindrivenarchitecture.provs.framework.extensions.workplace.base import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassBridgeKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassBridgeKtTest.kt similarity index 90% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassBridgeKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassBridgeKtTest.kt index a761eba..f9c6a6c 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassBridgeKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassBridgeKtTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.extensions.workplace.base +package org.domaindrivenarchitecture.provs.framework.extensions.workplace.base import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.ProvResult @@ -9,14 +9,14 @@ import org.domaindrivenarchitecture.provs.framework.core.processors.ContainerSta import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.domaindrivenarchitecture.provs.test.tags.NonCi -import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall -import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPair -import org.domaindrivenarchitecture.provs.ubuntu.keys.base.configureGpgKeys +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPair +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.configureGpgKeys import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test -import org.domaindrivenarchitecture.provs.extensions.test_keys.privateGPGSnakeoilKey -import org.domaindrivenarchitecture.provs.extensions.test_keys.publicGPGSnakeoilKey +import org.domaindrivenarchitecture.provs.framework.extensions.test_keys.privateGPGSnakeoilKey +import org.domaindrivenarchitecture.provs.framework.extensions.test_keys.publicGPGSnakeoilKey import org.domaindrivenarchitecture.provs.workplace.infrastructure.configureGopassBridgeJsonApi import org.domaindrivenarchitecture.provs.workplace.infrastructure.downloadGopassBridge import org.domaindrivenarchitecture.provs.workplace.infrastructure.installGopass diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassKtTest.kt similarity index 81% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassKtTest.kt index 6b5e8d0..3673521 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/GopassKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassKtTest.kt @@ -1,20 +1,20 @@ -package org.domaindrivenarchitecture.provs.extensions.workplace.base +package org.domaindrivenarchitecture.provs.framework.extensions.workplace.base 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.* -import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall -import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPair -import org.domaindrivenarchitecture.provs.ubuntu.keys.base.configureGpgKeys -import org.domaindrivenarchitecture.provs.ubuntu.keys.base.gpgFingerprint -import org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources.GopassSecretSource +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPair +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.configureGpgKeys +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.gpgFingerprint +import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources.GopassSecretSource import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.domaindrivenarchitecture.provs.extensions.test_keys.privateGPGSnakeoilKey -import org.domaindrivenarchitecture.provs.extensions.test_keys.publicGPGSnakeoilKey +import org.domaindrivenarchitecture.provs.framework.extensions.test_keys.privateGPGSnakeoilKey +import org.domaindrivenarchitecture.provs.framework.extensions.test_keys.publicGPGSnakeoilKey +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.* import org.domaindrivenarchitecture.provs.workplace.infrastructure.* import org.junit.jupiter.api.Assertions.assertFalse diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/VSCodeKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/VSCodeKtTest.kt similarity index 81% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/VSCodeKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/VSCodeKtTest.kt index aada005..49368d1 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/workplace/base/VSCodeKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/VSCodeKtTest.kt @@ -1,6 +1,6 @@ -package org.domaindrivenarchitecture.provs.extensions.workplace.base +package org.domaindrivenarchitecture.provs.framework.extensions.workplace.base -import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/filesystem/base/FilesystemKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/filesystem/base/FilesystemKtTest.kt similarity index 98% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/filesystem/base/FilesystemKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/filesystem/base/FilesystemKtTest.kt index e38e4a1..4e2eecf 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/filesystem/base/FilesystemKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/filesystem/base/FilesystemKtTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.ubuntu.filesystem.base +package org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/base/GitKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/GitKtTest.kt similarity index 72% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/base/GitKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/GitKtTest.kt index ca42c91..f8e8a01 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/base/GitKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/GitKtTest.kt @@ -1,9 +1,12 @@ -package org.domaindrivenarchitecture.provs.ubuntu.git.base +package org.domaindrivenarchitecture.provs.framework.ubuntu.git.base +import org.domaindrivenarchitecture.provs.framework.ubuntu.git.base.gitClone +import org.domaindrivenarchitecture.provs.framework.ubuntu.git.base.trustGithub +import org.domaindrivenarchitecture.provs.framework.ubuntu.git.base.trustGitlab import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest -import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall -import org.domaindrivenarchitecture.provs.ubuntu.keys.base.isHostKnown +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.isHostKnown import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/install/base/InstallKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/InstallKtTest.kt similarity index 79% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/install/base/InstallKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/InstallKtTest.kt index a70853f..2d67735 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/install/base/InstallKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/InstallKtTest.kt @@ -1,5 +1,7 @@ -package org.domaindrivenarchitecture.provs.ubuntu.install.base +package org.domaindrivenarchitecture.provs.framework.ubuntu.install.base +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstallFromPpa import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest import org.junit.jupiter.api.Assertions.assertTrue diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/ProvisionKeysTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/ProvisionKeysTest.kt similarity index 91% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/ProvisionKeysTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/ProvisionKeysTest.kt index cba7886..c32a0bb 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/ProvisionKeysTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/ProvisionKeysTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.ubuntu.keys +package org.domaindrivenarchitecture.provs.framework.ubuntu.keys import org.domaindrivenarchitecture.provs.framework.core.Secret import org.domaindrivenarchitecture.provs.test.defaultTestContainer diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/test_keys/TestKeys.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/TestKeys.kt similarity index 99% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/test_keys/TestKeys.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/TestKeys.kt index 8e66bcb..bdd2d7e 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/extensions/test_keys/TestKeys.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/TestKeys.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.extensions.test_keys +package org.domaindrivenarchitecture.provs.framework.ubuntu.keys fun publicGPGSnakeoilKey(): String { diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/GpgKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/GpgKtTest.kt similarity index 80% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/GpgKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/GpgKtTest.kt index 711c8d3..d508d8a 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/GpgKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/GpgKtTest.kt @@ -1,14 +1,12 @@ -package org.domaindrivenarchitecture.provs.ubuntu.keys.base +package org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base -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 -import org.domaindrivenarchitecture.provs.ubuntu.keys.KeyPair -import org.domaindrivenarchitecture.provs.ubuntu.keys.privateGPGSnakeoilKey -import org.domaindrivenarchitecture.provs.ubuntu.keys.publicGPGSnakeoilKey +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPair +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.privateGPGSnakeoilKey +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.publicGPGSnakeoilKey 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/ubuntu/keys/base/SshKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/SshKtTest.kt similarity index 65% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/SshKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/SshKtTest.kt index 60300ca..f909bd9 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/keys/base/SshKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/keys/base/SshKtTest.kt @@ -1,9 +1,11 @@ -package org.domaindrivenarchitecture.provs.ubuntu.keys.base +package org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base import org.domaindrivenarchitecture.provs.framework.core.Secret +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPair +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.privateSSHSnakeoilKey +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.publicSSHSnakeoilKey import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest -import org.domaindrivenarchitecture.provs.ubuntu.keys.* import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.* diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PromptSecretSourceTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PromptSecretSourceTest.kt similarity index 57% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PromptSecretSourceTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PromptSecretSourceTest.kt index 3374435..222c1ed 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/secret/secretSources/PromptSecretSourceTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/PromptSecretSourceTest.kt @@ -1,5 +1,6 @@ -package org.domaindrivenarchitecture.provs.ubuntu.secret.secretSources +package org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources +import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.secretSources.PromptSecretSource import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/ProvisionUserKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/ProvisionUserKtTest.kt similarity index 73% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/ProvisionUserKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/ProvisionUserKtTest.kt index 120c589..f7f84f5 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/user/ProvisionUserKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/user/ProvisionUserKtTest.kt @@ -1,16 +1,16 @@ -package org.domaindrivenarchitecture.provs.ubuntu.user +package org.domaindrivenarchitecture.provs.framework.ubuntu.user import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDir -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileContent -import org.domaindrivenarchitecture.provs.ubuntu.keys.* -import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSourceType -import org.domaindrivenarchitecture.provs.ubuntu.user.base.configureUser -import org.domaindrivenarchitecture.provs.ubuntu.user.base.createUser -import org.domaindrivenarchitecture.provs.ubuntu.user.base.userExists -import org.domaindrivenarchitecture.provs.ubuntu.user.base.userIsInGroupSudo +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContent +import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.* +import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSourceType +import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.configureUser +import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.createUser +import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.userExists +import org.domaindrivenarchitecture.provs.framework.ubuntu.user.base.userIsInGroupSudo 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/ubuntu/utils/UtilsKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/utils/UtilsKtTest.kt similarity index 97% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/utils/UtilsKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/utils/UtilsKtTest.kt index 765422a..1799e99 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/utils/UtilsKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/utils/UtilsKtTest.kt @@ -1,4 +1,4 @@ -package org.domaindrivenarchitecture.provs.ubuntu.utils +package org.domaindrivenarchitecture.provs.framework.ubuntu.utils import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.docker diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/web/base/WebKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/web/base/WebKtTest.kt similarity index 82% rename from src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/web/base/WebKtTest.kt rename to src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/web/base/WebKtTest.kt index 1c26410..1a9c8a4 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/ubuntu/web/base/WebKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/web/base/WebKtTest.kt @@ -1,10 +1,11 @@ -package org.domaindrivenarchitecture.provs.ubuntu.web.base +package org.domaindrivenarchitecture.provs.framework.ubuntu.web.base +import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFromURL import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createFile -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileContent -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileExists +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContent +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileExists import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.Test 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 88eff05..22358ab 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/application/CliWorkplaceKtTest.kt @@ -5,7 +5,7 @@ import io.mockk.every import io.mockk.mockkStatic import io.mockk.unmockkStatic import io.mockk.verify -import org.domaindrivenarchitecture.provs.core.* +import org.domaindrivenarchitecture.provs.framework.core.* import org.domaindrivenarchitecture.provs.framework.core.cli.retrievePassword import org.domaindrivenarchitecture.provs.framework.core.processors.PrintOnlyProcessor import org.domaindrivenarchitecture.provs.framework.core.* diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepositoryKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepositoryKtTest.kt index 90a0bbc..1c81324 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepositoryKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/ConfigRepositoryKtTest.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure import com.charleskorn.kaml.InvalidPropertyValueException -import org.domaindrivenarchitecture.provs.ubuntu.secret.SecretSourceType +import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSourceType import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceType import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test 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 72ea7d9..41dbfd4 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOpsKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/DevOpsKtTest.kt @@ -3,9 +3,9 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure 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 -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.createDirs -import org.domaindrivenarchitecture.provs.ubuntu.filesystem.base.fileContainsText +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs +import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.fileContainsText import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCodeKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCodeKtTest.kt index ba3d988..2b91406 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCodeKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/workplace/infrastructure/VSCodeKtTest.kt @@ -1,7 +1,7 @@ package org.domaindrivenarchitecture.provs.workplace.infrastructure import org.domaindrivenarchitecture.provs.test.defaultTestContainer -import org.domaindrivenarchitecture.provs.ubuntu.install.base.aptInstall +import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall import org.junit.jupiter.api.Test import org.junit.jupiter.api.Assertions.*