Implement secure communications

[nonrtric.git] / dmaap-mediator-producer / internal / config / config.go

diff --git a/dmaap-mediator-producer/internal/config/config.go b/dmaap-mediator-producer/internal/config/config.go
index 8a2784a..b31b334 100644 (file)
--- a/dmaap-mediator-producer/internal/config/config.go
+++ b/dmaap-mediator-producer/internal/config/config.go
@@ -28,32 +28,24 @@ import (
 )
 
 type Config struct {
-       LogLevel                            string
-       InfoProducerSupervisionCallbackHost string
-       InfoProducerSupervisionCallbackPort int
-       InfoJobCallbackHost                 string
-       InfoJobCallbackPort                 int
-       InfoCoordinatorAddress              string
-       MRHost                              string
-       MRPort                              int
-}
-
-type ProducerRegistrationInfo struct {
-       InfoProducerSupervisionCallbackUrl string   `json:"info_producer_supervision_callback_url"`
-       SupportedInfoTypes                 []string `json:"supported_info_types"`
-       InfoJobCallbackUrl                 string   `json:"info_job_callback_url"`
+       LogLevel               log.Level
+       InfoProducerHost       string
+       InfoProducerPort       int
+       InfoCoordinatorAddress string
+       DMaaPMRAddress         string
+       ProducerCertPath       string
+       ProducerKeyPath        string
 }
 
 func New() *Config {
        return &Config{
-               LogLevel:                            getEnv("LOG_LEVEL", "Info"),
-               InfoProducerSupervisionCallbackHost: getEnv("INFO_PRODUCER_SUPERVISION_CALLBACK_HOST", ""),
-               InfoProducerSupervisionCallbackPort: getEnvAsInt("INFO_PRODUCER_SUPERVISION_CALLBACK_PORT", 8085),
-               InfoJobCallbackHost:                 getEnv("INFO_JOB_CALLBACK_HOST", ""),
-               InfoJobCallbackPort:                 getEnvAsInt("INFO_JOB_CALLBACK_PORT", 8086),
-               InfoCoordinatorAddress:              getEnv("INFO_COORD_ADDR", "http://enrichmentservice:8083"),
-               MRHost:                              getEnv("MR_HOST", "http://message-router.onap"),
-               MRPort:                              getEnvAsInt("MR_PORT", 3904),
+               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"),
        }
 }
 
@@ -75,3 +67,13 @@ func getEnvAsInt(name string, defaultVal int) int {
 
        return defaultVal
 }
+
+func getLogLevel() log.Level {
+       logLevelStr := getEnv("LOG_LEVEL", "Info")
+       if loglevel, err := log.ParseLevel(logLevelStr); err == nil {
+               return loglevel
+       } else {
+               log.Warnf("Invalid log level: %v. Log level will be Info!", logLevelStr)
+               return log.InfoLevel
+       }
+}