refactor: *.k3s -> server

.idea-configs/cli-MyIdeConfig.yaml.run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="cli-MyIdeConfig.yaml" type="Application" factoryName="Application">
     <option name="ALTERNATIVE_JRE_PATH" value="Kotlin SDK" />
-    <option name="MAIN_CLASS_NAME" value="org.domaindrivenarchitecture.provs.workplace.application.CliKt" />
+    <option name="MAIN_CLASS_NAME" value="org.domaindrivenarchitecture.provs.desktop.application.CliKt" />
     <module name="provs.main" />
     <option name="PROGRAM_PARAMETERS" value="MyIdeConfig.yaml" />
     <method v="2">

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/Application.kt

@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.workplace.application
+package org.domaindrivenarchitecture.provs.desktop.application
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
-import org.domaindrivenarchitecture.provs.workplace.domain.provisionWorkplace
-import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceConfig
+import org.domaindrivenarchitecture.provs.desktop.domain.provisionWorkplace
+import org.domaindrivenarchitecture.provs.desktop.domain.WorkplaceConfig
 
 /**
  * Use case for provisioning a workplace

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplace.kt

@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.workplace.application
+package org.domaindrivenarchitecture.provs.desktop.application
 
 import kotlinx.serialization.SerializationException
 import org.domaindrivenarchitecture.provs.framework.core.cli.createProvInstance
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.getConfig
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.getConfig
 import java.io.FileNotFoundException
 import kotlin.system.exitProcess
 

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplaceCommand.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.application
+package org.domaindrivenarchitecture.provs.desktop.application
 
 import org.domaindrivenarchitecture.provs.framework.core.cli.TargetCliCommand
 

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplaceParser.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.application
+package org.domaindrivenarchitecture.provs.desktop.application
 
 import kotlinx.cli.ArgType
 import kotlinx.cli.optional

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/ProvisionWorkplace.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.domain
+package org.domaindrivenarchitecture.provs.desktop.domain
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult
@@ -11,7 +11,7 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.gpgFingerpr
 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.*
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.*
 
 
 /**

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/WorkplaceConfig.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.domain
+package org.domaindrivenarchitecture.provs.desktop.domain
 
 import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.KeyPairSource
 import kotlinx.serialization.Serializable

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/WorkplaceType.kt

@@ -0,0 +1,5 @@
+package org.domaindrivenarchitecture.provs.desktop.domain
+
+enum class WorkplaceType {
+    MINIMAL, OFFICE, IDE
+}

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Bash.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/ConfigRepository.kt

@@ -1,9 +1,9 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import com.charleskorn.kaml.Yaml
 import kotlinx.serialization.json.Json
 import org.domaindrivenarchitecture.provs.framework.core.tags.Api
-import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceConfig
+import org.domaindrivenarchitecture.provs.desktop.domain.WorkplaceConfig
 import java.io.BufferedReader
 import java.io.FileReader
 import java.io.FileWriter

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/DevOps.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Docker.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Fakturama.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Gopass.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/GopassBridge.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/IntelliJ.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/NoSwappiness.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.addTextToFile

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/PackageBundles.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 val KEY_MANAGEMENT = "ssh gnupg"
 

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Python.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Redshift.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VSCode.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VirtualBoxGuest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Zim.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult

src/main/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/server_software/k3s/application/Application.kt

@@ -1,13 +0,0 @@
-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()
-}
-

src/main/kotlin/org/domaindrivenarchitecture/provs/server/apple/Apple.kt

@@ -1,11 +1,11 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.infrastructure.apple
+package org.domaindrivenarchitecture.provs.server.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.framework.extensions.server_software.k3s.domain.applyK3sConfig
-import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain.installK3sServer
+import org.domaindrivenarchitecture.provs.server.domain.applyK3sConfig
+import org.domaindrivenarchitecture.provs.server.domain.installK3sServer
 
 
 /**

src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Application.kt

@@ -0,0 +1,13 @@
+package org.domaindrivenarchitecture.provs.server.application
+
+import org.domaindrivenarchitecture.provs.framework.core.Prov
+import org.domaindrivenarchitecture.provs.server.domain.installK3sServer
+
+
+/**
+ * Performs use case of provisioning a k3s server
+ */
+fun Prov.provisionK3s() = task {
+    installK3sServer()
+}
+

src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/Cli.kt

@@ -1,7 +1,7 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.server.application
 
 import org.domaindrivenarchitecture.provs.framework.core.cli.createProvInstance
-import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain.installK3sAsContainers
+import org.domaindrivenarchitecture.provs.server.domain.installK3sAsContainers
 import kotlin.system.exitProcess
 
 

src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/CliK3sArgumentsParser.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.server.application
 
 import kotlinx.cli.ArgType
 import kotlinx.cli.default

src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/CliK3sCommand.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.server.application
 
 import org.domaindrivenarchitecture.provs.framework.core.cli.TargetCliCommand
 

src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/K3d.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain
+package org.domaindrivenarchitecture.provs.server.domain
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.docker.provideContainer

src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/K3s.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain
+package org.domaindrivenarchitecture.provs.server.domain
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
 import org.domaindrivenarchitecture.provs.framework.core.ProvResult

src/main/kotlin/org/domaindrivenarchitecture/provs/workplace/domain/WorkplaceType.kt

@@ -1,5 +0,0 @@
-package org.domaindrivenarchitecture.provs.workplace.domain
-
-enum class WorkplaceType {
-    MINIMAL, OFFICE, IDE
-}

src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/application/CliWorkplaceKtTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.application
+package org.domaindrivenarchitecture.provs.desktop.application
 
 import ch.qos.logback.classic.Level
 import io.mockk.every
@@ -8,12 +8,11 @@ import io.mockk.verify
 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.*
 import org.domaindrivenarchitecture.provs.test.setRootLoggingLevel
-import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceConfig
-import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceType
-import org.domaindrivenarchitecture.provs.workplace.domain.provisionWorkplace
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.getConfig
+import org.domaindrivenarchitecture.provs.desktop.domain.WorkplaceConfig
+import org.domaindrivenarchitecture.provs.desktop.domain.WorkplaceType
+import org.domaindrivenarchitecture.provs.desktop.domain.provisionWorkplace
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.getConfig
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeAll

src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/ConfigRepositoryKtTest.kt

@@ -1,8 +1,8 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import com.charleskorn.kaml.InvalidPropertyValueException
 import org.domaindrivenarchitecture.provs.framework.ubuntu.secret.SecretSourceType
-import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceType
+import org.domaindrivenarchitecture.provs.desktop.domain.WorkplaceType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows

src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/DevOpsKtTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.getResourceAsText
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer

src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/PythonKtTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest

src/test/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/VSCodeKtTest.kt

@@ -1,4 +1,4 @@
-package org.domaindrivenarchitecture.provs.workplace.infrastructure
+package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/ProvisionWorkplaceKtTest.kt

@@ -2,9 +2,9 @@ package org.domaindrivenarchitecture.provs.framework.extensions.workplace
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
-import org.domaindrivenarchitecture.provs.workplace.domain.WorkplaceType
-import org.domaindrivenarchitecture.provs.workplace.domain.provisionWorkplace
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.getConfig
+import org.domaindrivenarchitecture.provs.desktop.domain.WorkplaceType
+import org.domaindrivenarchitecture.provs.desktop.domain.provisionWorkplace
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.getConfig
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/FakturamaKtTest.kt

@@ -2,7 +2,7 @@ package org.domaindrivenarchitecture.provs.framework.extensions.workplace.base
 
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.installFakturama
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.installFakturama
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassBridgeKtTest.kt

@@ -17,10 +17,10 @@ import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 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
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.installGopassBridgeJsonApi
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.configureGopassBridgeJsonApi
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.downloadGopassBridge
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.installGopass
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.installGopassBridgeJsonApi
 
 
 internal class GopassBridgeKtTest {

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassKtTest.kt

@@ -15,7 +15,7 @@ import org.junit.jupiter.api.Test
 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.domaindrivenarchitecture.provs.desktop.infrastructure.*
 import org.junit.jupiter.api.Assertions.assertFalse
 
 

src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/VSCodeKtTest.kt

@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.domaindrivenarchitecture.provs.test.defaultTestContainer
-import org.domaindrivenarchitecture.provs.workplace.infrastructure.installVSC
+import org.domaindrivenarchitecture.provs.desktop.infrastructure.installVSC
 
 
 internal class VSCodeKtTest {

src/test/kotlin/org/domaindrivenarchitecture/provs/server/application/CliK3sCommandKtTest.kt

@@ -1,5 +1,7 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.server.application
 
+import org.domaindrivenarchitecture.provs.server.application.CliK3sArgumentsParser
+import org.domaindrivenarchitecture.provs.server.application.parseServerArguments
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.Assertions.*
 

src/test/kotlin/org/domaindrivenarchitecture/provs/server/application/CliKtTest.kt

@@ -1,5 +1,6 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.application
+package org.domaindrivenarchitecture.provs.server.application
 
+import org.domaindrivenarchitecture.provs.server.application.main
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 

src/test/kotlin/org/domaindrivenarchitecture/provs/server/domain/K3dKtTest.kt

@@ -1,12 +1,12 @@
-package org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.domain
+package org.domaindrivenarchitecture.provs.server.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.framework.extensions.server_software.k3s.infrastructure.apple.appleConfig
-import org.domaindrivenarchitecture.provs.framework.extensions.server_software.k3s.infrastructure.apple.checkAppleService
+import org.domaindrivenarchitecture.provs.server.apple.appleConfig
+import org.domaindrivenarchitecture.provs.server.apple.checkAppleService
 import org.domaindrivenarchitecture.provs.test.tags.ContainerTest
 import org.domaindrivenarchitecture.provs.test.tags.NonCi
 import org.junit.jupiter.api.Assertions.assertTrue