Conf Oclib Package Lightest

conf/conf.go

@@ -8,18 +8,14 @@ import (
 )
 
 type Config struct {
-	MonitorPath 	string
+	MonitorPath string
-	MongoUrl    	string
+	Logs        string
-	DBName      	string
+	Mode        string
-	Logs        	string
+	KubeHost    string
-	LokiUrl     	string
+	KubePort    string
-	NatsUrl     	string
+	KubeCA      string
-	Mode			string
+	KubeCert    string
-	KubeHost    	string
+	KubeData    string
-	KubePort    	string
-	KubeCA      	string
-	KubeCert    	string
-	KubeData    	string
 }
 
 var instance *Config

daemons/execute_monitor_container.go

@@ -8,29 +8,30 @@ import (
 	"net/http"
 	"oc-schedulerd/conf"
 
+	oclib "cloud.o-forge.io/core/oc-lib"
 	"github.com/rs/zerolog"
 )
 
 type ContainerMonitor struct {
-	Monitor 	LocalMonitor
+	Monitor  LocalMonitor
-	KubeCA		string
+	KubeCA   string
-	KubeCert	string
+	KubeCert string
-	KubeData	string
+	KubeData string
-	KubeHost	string
+	KubeHost string
-	KubePort	string
+	KubePort string
 }
 
-func NewContainerMonitor(UUID string, peerId string, duration int) (Executor){
+func NewContainerMonitor(UUID string, peerId string, duration int) Executor {
 	return &ContainerMonitor{
 		Monitor: LocalMonitor{
 			ExecutionID: UUID,
-			PeerID: peerId,
+			PeerID:      peerId,
-			Duration: duration,
+			Duration:    duration,
-			LokiUrl: conf.GetConfig().LokiUrl,
+			LokiUrl:     oclib.GetConfig().LokiUrl,
-			MongoUrl: conf.GetConfig().MongoUrl,
+			MongoUrl:    oclib.GetConfig().MongoUrl,
-			DBName: conf.GetConfig().DBName,
+			DBName:      oclib.GetConfig().MongoDatabase,
 		},
-		KubeCA: conf.GetConfig().KubeCA,
+		KubeCA:   conf.GetConfig().KubeCA,
 		KubeCert: conf.GetConfig().KubeCert,
 		KubeData: conf.GetConfig().KubeData,
 		KubeHost: conf.GetConfig().KubeHost,
@@ -82,14 +83,14 @@ func (cm *ContainerMonitor) LaunchMonitor(args []string, l zerolog.Logger) {
 		l.Fatal().Msg("Couldn't find the oc-monitord image : " + string(d))
 	}
 
-	dataCreation := map[string]interface{}{"Image": imageName, "Cmd" : args}
+	dataCreation := map[string]interface{}{"Image": imageName, "Cmd": args}
 	byteData, err := json.Marshal(dataCreation)
 	if err != nil {
 		l.Fatal().Msg("Error when contacting the creating request body : " + err.Error())
 	}
 
-	r, _ := http.NewRequest("POST",url + "/containers/create", bytes.NewBuffer(byteData))
+	r, _ := http.NewRequest("POST", url+"/containers/create", bytes.NewBuffer(byteData))
-	r.Header.Add("Content-Type","application/json")
+	r.Header.Add("Content-Type", "application/json")
 	resp, err = http.DefaultClient.Do(r)
 	if err != nil {
 		l.Fatal().Msg("Error when contacting the docker API on " + url + ": " + err.Error())
@@ -116,9 +117,9 @@ func (cm *ContainerMonitor) LaunchMonitor(args []string, l zerolog.Logger) {
 
 	networkName := "oc"
 
-	dataNetwork, _ := json.Marshal(map[string]string{"Container" : containerID})
+	dataNetwork, _ := json.Marshal(map[string]string{"Container": containerID})
-	r, _ = http.NewRequest("POST",url + "/networks/" + networkName + "/connect", bytes.NewBuffer(dataNetwork))
+	r, _ = http.NewRequest("POST", url+"/networks/"+networkName+"/connect", bytes.NewBuffer(dataNetwork))
-	r.Header.Add("Content-Type","application/json")
+	r.Header.Add("Content-Type", "application/json")
 	resp, err = http.DefaultClient.Do(r)
 	if err != nil {
 		l.Fatal().Msg("Error when contacting the docker API on " + url + ": " + err.Error())
@@ -129,7 +130,7 @@ func (cm *ContainerMonitor) LaunchMonitor(args []string, l zerolog.Logger) {
 		return
 	}
 
-	resp, err = http.Post( url + "/containers/" + containerID + "/start", "", nil)
+	resp, err = http.Post(url+"/containers/"+containerID+"/start", "", nil)
 	if err != nil {
 		l.Fatal().Msg("Error when contacting the docker API on " + url + ": " + err.Error())
 	}

daemons/execute_monitor_local.go

@@ -5,6 +5,7 @@ import (
 	"oc-schedulerd/conf"
 	"os/exec"
 
+	oclib "cloud.o-forge.io/core/oc-lib"
 	"github.com/rs/zerolog"
 )
 
@@ -12,20 +13,19 @@ type LocalMonitor struct {
 	ExecutionID string
 	PeerID      string
 	Duration    int
-	LokiUrl		string
+	LokiUrl     string
-	MongoUrl	string
+	MongoUrl    string
-	DBName		string
+	DBName      string
-
 }
 
-func NewLocalMonitor(UUID string, peerId string, duration int) (Executor){
+func NewLocalMonitor(UUID string, peerId string, duration int) Executor {
 	return &LocalMonitor{
 		ExecutionID: UUID,
-		PeerID: peerId,
+		PeerID:      peerId,
-		Duration: duration,
+		Duration:    duration,
-		LokiUrl: conf.GetConfig().LokiUrl,
+		LokiUrl:     oclib.GetConfig().LokiUrl,
-		MongoUrl: conf.GetConfig().MongoUrl,
+		MongoUrl:    oclib.GetConfig().MongoUrl,
-		DBName: conf.GetConfig().DBName,
+		DBName:      oclib.GetConfig().MongoDatabase,
 	}
 }
 
@@ -46,7 +46,6 @@ func (lm *LocalMonitor) PrepareMonitorExec() []string {
 		"-d", lm.DBName,
 	}
 
-
 	if lm.Duration > 0 {
 		args = append(args, "-t", fmt.Sprintf("%d", lm.Duration))
 	}
@@ -54,7 +53,7 @@ func (lm *LocalMonitor) PrepareMonitorExec() []string {
 	return args
 }
 
-func (lm *LocalMonitor) LaunchMonitor(args []string, l zerolog.Logger)  {
+func (lm *LocalMonitor) LaunchMonitor(args []string, l zerolog.Logger) {
 	cmd := exec.Command(conf.GetConfig().MonitorPath, args...)
 	fmt.Printf("Command : %v\n", cmd)
 
@@ -70,4 +69,3 @@ func (lm *LocalMonitor) LaunchMonitor(args []string, l zerolog.Logger)  {
 
 	logExecution(stdoutMonitord, l)
 }
-

main.go

@@ -14,18 +14,6 @@ func main() {
 	l := oclib.GetLogger()
 	o := oclib.GetConfLoader()
 
-	c := oclib.SetConfig(
-		o.GetStringDefault("MONGO_URL", "mongodb://127.0.0.1:27017"),
-		o.GetStringDefault("MONGO_DATABASE", "DC_myDC"),
-		o.GetStringDefault("NATS_URL", "nats://localhost:4222"),
-		o.GetStringDefault("LOKI_URL", ""),
-		o.GetStringDefault("LOG_LEVEL", "info"),
-	)
-
-	conf.GetConfig().DBName = c.MongoDatabase
-	conf.GetConfig().MongoUrl = c.MongoUrl
-	conf.GetConfig().NatsUrl = c.NATSUrl
-	conf.GetConfig().LokiUrl = c.LokiUrl
 	conf.GetConfig().Mode = o.GetStringDefault("MODE", "")
 
 	if conf.GetConfig().Mode == "container" {