Moving constants to env variables.

Change-Id: I111c0bae368565a87e96e504a1985b100b0fe182

diff --git a/mecm/mepm/applcm/broker/cmd/broker/main.go b/mecm/mepm/applcm/broker/cmd/broker/main.go
index 450cb49..c6af362 100644 (file)
--- a/mecm/mepm/applcm/broker/cmd/broker/main.go
+++ b/mecm/mepm/applcm/broker/cmd/broker/main.go
@@ -23,13 +23,14 @@ import (
        "os"
 )
 
-const (
-       //logFile = "/go/release/logfile"
-       logFile = "/home/root1/code/akraino/ealt-edge/mecm/mepm/applcm/broker/cmd/broker/logfile"
-       loggerLevel = logrus.InfoLevel
-       applcmAddress = "0.0.0.0:8081"
+// Variables to be defined in deployment file
+var (
+       logFile = os.Getenv("LOGFILE_PATH")
+       loggerLevel = os.Getenv("LOGGER_LEVEL")
+       applcmAddress = os.Getenv("ADDRESS")
 )
 
+
 func main() {
        // Prepare logger
        file, err := os.Create(logFile)
@@ -38,7 +39,8 @@ func main() {
        }
        defer file.Close()
 
-       var logger = util.GetLogger(logFile, loggerLevel, file)
+       level, err := logrus.ParseLevel(loggerLevel)
+       var logger = util.GetLogger(logFile, level, file)
 
        handler := &handlers.Handlers{}
        handler.Initialize(logger)

diff --git a/mecm/mepm/applcm/broker/pkg/handlers/handlers.go b/mecm/mepm/applcm/broker/pkg/handlers/handlers.go
index 0cb3adb..9d871ab 100644 (file)
--- a/mecm/mepm/applcm/broker/pkg/handlers/handlers.go
+++ b/mecm/mepm/applcm/broker/pkg/handlers/handlers.go
@@ -19,6 +19,7 @@ import (
        "github.com/gorilla/mux"
        "github.com/sirupsen/logrus"
        "net/http"
+       "os"
 )
 
 // URLS
@@ -33,10 +34,9 @@ const (
     QueryOnboardPackage = "/ealtedge/mepm/app_pkgm/v1/app_packages/{appPkgId}"
 )
 
-// Package paths, to be created in deployment file (docker-compose/k8s yaml/helm)
-const (
-       PackageFolderPath = "/go/release/application/packages/"
-       PackageArtifactPath = "/Artifacts/Deployment/"
+var (
+       PackageFolderPath = os.Getenv("PACKAGE_PATH")
+       PackageArtifactPath = os.Getenv("PACKAGE_ARTIFACT_PATH")
 )
 
 // Handler of REST APIs

diff --git a/mecm/mepm/applcm/resources/docker-compose.yaml b/mecm/mepm/applcm/resources/docker-compose.yaml
index d64fa97..adff907 100644 (file)
--- a/mecm/mepm/applcm/resources/docker-compose.yaml
+++ b/mecm/mepm/applcm/resources/docker-compose.yaml
@@ -11,22 +11,16 @@ services:
     image: mysql:5.7
     environment:
       MYSQL_DATABASE: 'db'
-      # So you don't have to use root, but you can if you like
       MYSQL_USER: 'root'
-      # You can use whatever password you like
       MYSQL_PASSWORD: 'password'
       # Password for root access
       MYSQL_ROOT_PASSWORD: 'password'
     ports:
-      # <Port exposed> : < MySQL Port running inside container>
       - '3306:3306'
     expose:
-      # Opens port 3306 on the container
       - '3306'
-      # Where our data will be persisted
     volumes:
       - my-db:/var/lib/mysql
-      - /var/lib/mysql
     logging:
       driver: "json-file"
       options:
@@ -46,19 +40,19 @@ services:
     container_name: applcm-broker
     environment:
       MYSQL_DATABASE: 'db'
-      # So you don't have to use root, but you can if you like
       MYSQL_USER: 'root'
-      # You can use whatever password you like
       MYSQL_PASSWORD: 'password'
-      # Password for root access
       MYSQL_ROOT_PASSWORD: 'password'
       HELM_PLUGIN_PORT: '50051'
       KUBERNETES_PLUGIN_PORT: '50052'
+      LOGFILE_PATH: "/go/release/logfile"
+      LOGGER_LEVEL: "logrus.InfoLevel"
+      ADDRESS: "0.0.0.0:8081"
+      PACKAGE_PATH: "/go/release/application/packages/"
+      PACKAGE_ARTIFACT_PATH: "/Artifacts/Deployment/"
     ports:
-      # <Port exposed> : < Applcm Broker Port running inside container>
       - '28081:8081'
     expose:
-      # Opens port 8081 on the container
       - '8081'
     logging:
       driver: "json-file"
@@ -85,9 +79,12 @@ services:
       # Presently all application to be deployed in same namespace, in future it can be an input while app creation
       RELEASE_NAMESPACE: "default"
     ports:
-      # <Port exposed> : < Applcm helm plugin Port running inside container>
       - '50051:50051'
     expose:
-      # Opens port 50051 on the container
       - '50051'
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
 # yamllint enable