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

[skip ci] change default syspec config to syspec-office-config.yaml

Browse source
This commit is contained in:
az 2022-09-15 19:17:47 +02:00
parent e689e1c8c4
commit 71a3f778c8
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/org/domaindrivenarchitecture/provs/syspec/infrastructure/SyspecConfigRepo.kt
View file

@ -15,7 +15,7 @@ internal fun findSpecConfigFromFile(file: ConfigFileName? = null): Result<Syspec
val filePath = file?.fileName ?: DEFAULT_CONFIG_FILE
if ((filePath == DEFAULT_CONFIG_FILE) && !File(filePath).exists()) {
// use default ide config
return findSpecConfigFromResource("org/domaindrivenarchitecture/provs/syspec/syspec-ide-config.yaml")
return findSpecConfigFromResource("org/domaindrivenarchitecture/provs/syspec/syspec-office-config.yaml")
}
readFromFile(filePath).yamlToType()
}

6
src/test/kotlin/org/domaindrivenarchitecture/provs/framework/core/ProvTest.kt
View file

@ -39,9 +39,8 @@ internal class ProvTest {
val script = """
# test some script commands
ping -c1 nu.nl
ping -c1 hetzner.com
echo something
ping -c1 github.com
"""
// when
@ -58,9 +57,8 @@ internal class ProvTest {
val script = """
# test some script commands
ping -c1 google.com
ping -c1 hetzner.com
echo something
ping -c1 github.com
echo 1 # comment behind command
"""

2
src/test/kotlin/org/domaindrivenarchitecture/provs/syspec/infrastructure/SyspecConfigRepoKtTest.kt
View file

@ -14,7 +14,7 @@ internal class SyspecConfigRepoKtTest {
// then
assertEquals(
"SyspecConfig(command=[CommandSpec(command=tfenv -h, out=null), CommandSpec(command=python3 --version, out=null), CommandSpec(command=pip3 --version, out=null), CommandSpec(command=terraform --version, out=1.0.8)], file=null, folder=null, host=null, package=[PackageSpec(name=firefox, installed=true), PackageSpec(name=thunderbird, installed=true), PackageSpec(name=ssh, installed=true), PackageSpec(name=git, installed=true), PackageSpec(name=leiningen, installed=true)], netcat=null, socket=null, certificate=null, s3=null)",
"SyspecConfig(command=null, file=null, folder=null, host=null, package=[PackageSpec(name=firefox, installed=true), PackageSpec(name=thunderbird, installed=true), PackageSpec(name=ssh, installed=true), PackageSpec(name=git, installed=true)], netcat=null, socket=null, certificate=null, s3=null)",
res.getOrNull().toString())
}