Introduce choice between secure and non secure com
The DMaaP Mediator producer now uses secure communication towards any
address configured to use the https scheme. If its own callback is
configured to the https scheme, it will only listen to an https port,
otherwise it will only use an http port.
Also moved the certificate and key files to a separate folder.
Issue-ID: NONRTRIC-633
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Change-Id: Id3bb18e83d40d26740b71be7901911c9a41502e3
diff --git a/dmaap-mediator-producer/internal/config/config.go b/dmaap-mediator-producer/internal/config/config.go
index b31b334..eef1b5f 100644
--- a/dmaap-mediator-producer/internal/config/config.go
+++ b/dmaap-mediator-producer/internal/config/config.go
@@ -21,6 +21,7 @@
package config
import (
+ "fmt"
"os"
"strconv"
@@ -39,16 +40,19 @@
func New() *Config {
return &Config{
- LogLevel: getLogLevel(),
InfoProducerHost: getEnv("INFO_PRODUCER_HOST", ""),
InfoProducerPort: getEnvAsInt("INFO_PRODUCER_PORT", 8085),
InfoCoordinatorAddress: getEnv("INFO_COORD_ADDR", "https://enrichmentservice:8434"),
DMaaPMRAddress: getEnv("DMAAP_MR_ADDR", "https://message-router.onap:3905"),
- ProducerCertPath: getEnv("PRODUCER_CERT_PATH", "configs/producer.crt"),
- ProducerKeyPath: getEnv("PRODUCER_KEY_PATH", "configs/producer.key"),
+ ProducerCertPath: getEnv("PRODUCER_CERT_PATH", "security/producer.crt"),
+ ProducerKeyPath: getEnv("PRODUCER_KEY_PATH", "security/producer.key"),
+ LogLevel: getLogLevel(),
}
}
+func (c Config) String() string {
+ return fmt.Sprintf("InfoProducerHost: %v, InfoProducerPort: %v, InfoCoordinatorAddress: %v, DMaaPMRAddress: %v, ProducerCertPath: %v, ProducerKeyPath: %v, LogLevel: %v", c.InfoProducerHost, c.InfoProducerPort, c.InfoCoordinatorAddress, c.DMaaPMRAddress, c.ProducerCertPath, c.ProducerKeyPath, c.LogLevel)
+}
func getEnv(key string, defaultVal string) string {
if value, exists := os.LookupEnv(key); exists {
return value