diff options
Diffstat (limited to 'sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidator.kt')
| -rw-r--r-- | sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidator.kt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidator.kt b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidator.kt index ead5655a..407fd745 100644 --- a/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidator.kt +++ b/sources/hv-collector-configuration/src/main/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidator.kt @@ -29,6 +29,7 @@ import org.onap.dcae.collectors.veshv.config.api.model.HvVesConfiguration import org.onap.dcae.collectors.veshv.config.api.model.ServerConfiguration import org.onap.dcae.collectors.veshv.config.api.model.ValidationException import org.onap.dcae.collectors.veshv.ssl.boundary.SecurityConfiguration +import org.onap.dcae.collectors.veshv.ssl.boundary.SecurityKeysPaths import org.onap.dcae.collectors.veshv.utils.arrow.OptionUtils.binding import org.onap.dcae.collectors.veshv.utils.arrow.mapBinding import org.onap.dcae.collectors.veshv.utils.arrow.doOnEmpty @@ -54,7 +55,9 @@ internal class ConfigurationValidator { .doOnEmpty { logger.debug { "Cannot bind cbs configuration" } } .bind() - val securityConfiguration = SecurityConfiguration(partialConfig.security.bind().keys) + val securityConfiguration = validatedSecurityConfiguration(partialConfig) + .doOnEmpty { logger.debug { "Cannot bind security configuration" } } + .bind() val collectorConfiguration = validatedCollectorConfig(partialConfig) .doOnEmpty { logger.debug { "Cannot bind collector configuration" } } @@ -91,7 +94,7 @@ internal class ConfigurationValidator { } } - fun validatedCbsConfiguration(partial: PartialConfiguration) = + internal fun validatedCbsConfiguration(partial: PartialConfiguration) = partial.mapBinding { it.cbs.bind().let { CbsConfiguration( @@ -101,6 +104,13 @@ internal class ConfigurationValidator { } } + private fun validatedSecurityConfiguration(partial: PartialConfiguration) = + partial.mapBinding { + it.security.bind().let { + SecurityConfiguration(it.keys.map(SecurityKeysPaths::asImmutableSecurityKeys)) + } + } + private fun validatedCollectorConfig(partial: PartialConfiguration) = partial.mapBinding { partial.collector.bind().let { |