diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sService.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sService.kt index d75dc41..955adae 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sService.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sService.kt @@ -12,12 +12,12 @@ fun Prov.provisionK3sCommand(cli: K3sCliCommand) = task { val grafanaConfigResolved: GrafanaAgentConfigResolved? = findK8sGrafanaConfig(cli.configFileName)?.resolveSecret() - if (cli.onlyModules == null ) { + if (cli.onlyModules == null) { val k3sConfig: K3sConfig = getK3sConfig(cli.configFileName) DefaultConfigFileRepository().assertExists(cli.configFileName) val k3sConfigReprovision = k3sConfig.copy(reprovision = cli.reprovision || k3sConfig.reprovision) - val applicationFile = DefaultApplicationFileRepository(cli.applicationFileName).getFile() + val applicationFile = cli.applicationFileName?.let { DefaultApplicationFileRepository(cli.applicationFileName).getFile() } provisionK3s(k3sConfigReprovision, grafanaConfigResolved, applicationFile) } else { provisionGrafana(cli.onlyModules, grafanaConfigResolved) @@ -30,7 +30,8 @@ fun Prov.provisionK3sCommand(cli: K3sCliCommand) = task { fun Prov.provisionK3s( k3sConfig: K3sConfig, grafanaConfigResolved: GrafanaAgentConfigResolved? = null, - applicationFile: ApplicationFile? = null) = task { + applicationFile: ApplicationFile? = null +) = task { if (k3sConfig.reprovision) { deprovisionK3sInfra() @@ -64,7 +65,8 @@ fun Prov.provisionK3s( private fun Prov.provisionGrafana( onlyModules: List?, - grafanaConfigResolved: GrafanaAgentConfigResolved?) = task { + grafanaConfigResolved: GrafanaAgentConfigResolved? +) = task { if (onlyModules != null && onlyModules.contains(ServerOnlyModule.GRAFANA.name.lowercase())) { if (grafanaConfigResolved == null) { diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/DefaultApplicationFileRepository.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/DefaultApplicationFileRepository.kt index 4a33d16..8cc006e 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/DefaultApplicationFileRepository.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/DefaultApplicationFileRepository.kt @@ -5,19 +5,20 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.check import org.domaindrivenarchitecture.provs.server.domain.k3s.ApplicationFile import org.domaindrivenarchitecture.provs.server.domain.k3s.ApplicationFileName import org.domaindrivenarchitecture.provs.server.domain.k3s.ApplicationFileRepository -import java.io.File -class DefaultApplicationFileRepository(val applicationFileName: ApplicationFileName?) : ApplicationFileRepository { - private fun assertExists(applicationFileName: String?) { - if (applicationFileName != null && !checkLocalFile(applicationFileName)) { +class DefaultApplicationFileRepository(val applicationFileName: ApplicationFileName) : ApplicationFileRepository { + + private fun assertExists(applicationFileName: String) { + if (!checkLocalFile(applicationFileName)) { throw RuntimeException("Application file not found. Please check if path is correct.") } } - override fun getFile() : ApplicationFile { - assertExists(applicationFileName!!.fullyQualifiedName()) - val applicationFileContents = getLocalFileContent(applicationFileName.fullyQualifiedName()) + override fun getFile(): ApplicationFile { + assertExists(applicationFileName.fullyQualifiedName()) + + val applicationFileContents = getLocalFileContent(applicationFileName.fullyQualifiedName()) val applicationFile = ApplicationFile(applicationFileName, applicationFileContents) return if (applicationFile.isValid()) { applicationFile }