wip

Clivern · Jul 10, 2021 · 2e45431 · 2e45431
1 parent 6035c9f
commit 2e45431
Show file tree

Hide file tree

Showing 9 changed files with 207 additions and 82 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM golang:1.16.5
 
-ARG PEANUT_VERSION=0.1.6
+ARG PEANUT_VERSION=0.1.7
 
 ENV GO111MODULE=on
 

diff --git a/README.md b/README.md
@@ -10,10 +10,10 @@
             <img src="https://github.com/Clivern/Peanut/workflows/Release/badge.svg">
         </a>
         <a href="https://github.com/Clivern/Peanut/releases">
-            <img src="https://img.shields.io/badge/Version-0.1.6-red.svg">
+            <img src="https://img.shields.io/badge/Version-0.1.7-red.svg">
         </a>
         <a href="https://goreportcard.com/report/github.com/Clivern/Peanut">
-            <img src="https://goreportcard.com/badge/github.com/Clivern/Peanut?v=0.1.6">
+            <img src="https://goreportcard.com/badge/github.com/Clivern/Peanut?v=0.1.7">
         </a>
         <a href="https://godoc.org/github.com/clivern/peanut">
             <img src="https://godoc.org/github.com/clivern/peanut?status.svg">

diff --git a/core/controller/misc.go b/core/controller/misc.go
@@ -0,0 +1,75 @@
+// Copyright 2021 Clivern. All rights reserved.
+// Use of this source code is governed by the MIT
+// license that can be found in the LICENSE file.
+
+package controller
+
+// Message interface
+type Message interface {
+	GetCorrelation() string
+	GetService() string
+	GetJob() string
+	GetType() string
+}
+
+// DeployRequest type
+type DeployRequest struct {
+	JobID         string            `json:"jobId"`
+	ServiceID     string            `json:"serviceId"`
+	Template      string            `json:"template"`
+	Configs       map[string]string `json:"configs"`
+	DeleteAfter   string            `json:"deleteAfter"`
+	Type          string            `json:"type"`
+	CorrelationID string            `json:"correlationID"`
+}
+
+// DestroyRequest type
+type DestroyRequest struct {
+	JobID         string            `json:"jobId"`
+	ServiceID     string            `json:"serviceId"`
+	Template      string            `json:"template"`
+	Configs       map[string]string `json:"configs"`
+	DeleteAfter   string            `json:"deleteAfter"`
+	Type          string            `json:"type"`
+	CorrelationID string            `json:"correlationID"`
+}
+
+// GetCorrelation gets the correlation id
+func (d DeployRequest) GetCorrelation() string {
+	return d.CorrelationID
+}
+
+// GetService gets the service id
+func (d DeployRequest) GetService() string {
+	return d.ServiceID
+}
+
+// GetJob gets the job id
+func (d DeployRequest) GetJob() string {
+	return d.JobID
+}
+
+// GetType gets the job type
+func (d DeployRequest) GetType() string {
+	return d.Type
+}
+
+// GetCorrelation gets the correlation id
+func (d DestroyRequest) GetCorrelation() string {
+	return d.CorrelationID
+}
+
+// GetService gets the service id
+func (d DestroyRequest) GetService() string {
+	return d.ServiceID
+}
+
+// GetJob gets the job id
+func (d DestroyRequest) GetJob() string {
+	return d.JobID
+}
+
+// GetType gets the job type
+func (d DestroyRequest) GetType() string {
+	return d.Type
+}
diff --git a/core/controller/workers.go b/core/controller/workers.go
@@ -19,73 +19,6 @@ import (
 	"github.com/spf13/viper"
 )
 
-// Message interface
-type Message interface {
-	GetCorrelation() string
-	GetService() string
-	GetJob() string
-	GetType() string
-}
-
-// DeployRequest type
-type DeployRequest struct {
-	JobID         string            `json:"jobId"`
-	ServiceID     string            `json:"serviceId"`
-	Template      string            `json:"template"`
-	Configs       map[string]string `json:"configs"`
-	DeleteAfter   string            `json:"deleteAfter"`
-	Type          string            `json:"type"`
-	CorrelationID string            `json:"correlationID"`
-}
-
-// DestroyRequest type
-type DestroyRequest struct {
-	JobID         string `json:"jobId"`
-	ServiceID     string `json:"serviceId"`
-	Type          string `json:"type"`
-	CorrelationID string `json:"correlationID"`
-}
-
-// GetCorrelation gets the correlation id
-func (d DeployRequest) GetCorrelation() string {
-	return d.CorrelationID
-}
-
-// GetService gets the service id
-func (d DeployRequest) GetService() string {
-	return d.ServiceID
-}
-
-// GetJob gets the job id
-func (d DeployRequest) GetJob() string {
-	return d.JobID
-}
-
-// GetType gets the job type
-func (d DeployRequest) GetType() string {
-	return d.Type
-}
-
-// GetCorrelation gets the correlation id
-func (d DestroyRequest) GetCorrelation() string {
-	return d.CorrelationID
-}
-
-// GetService gets the service id
-func (d DestroyRequest) GetService() string {
-	return d.ServiceID
-}
-
-// GetJob gets the job id
-func (d DestroyRequest) GetJob() string {
-	return d.JobID
-}
-
-// GetType gets the job type
-func (d DestroyRequest) GetType() string {
-	return d.Type
-}
-
 // Workers type
 type Workers struct {
 	job              *model.Job
@@ -128,7 +61,7 @@ func (w *Workers) DeployRequest(c *gin.Context, rawBody []byte) {
 	if err != nil {
 		log.WithFields(log.Fields{
 			"error": err.Error(),
-		}).Error(`Invalid message`)
+		}).Debug(`Invalid message`)
 
 		c.JSON(http.StatusBadRequest, gin.H{
 			"correlationID": c.GetHeader("x-correlation-id"),
@@ -192,13 +125,27 @@ func (w *Workers) DestroyRequest(c *gin.Context, rawBody []byte) {
 		Type:          "DestroyRequest",
 	}
 
+	service, err := w.service.GetRecord(c.Param("serviceId"))
+
+	if err != nil {
+		c.JSON(http.StatusNotFound, gin.H{
+			"correlationID": c.GetHeader("x-correlation-id"),
+			"errorMessage":  "Error! service not found",
+		})
+		return
+	}
+
+	message.Template = service.Template
+	message.Configs = service.Configs
+	message.DeleteAfter = service.DeleteAfter
+
 	log.WithFields(log.Fields{
 		"correlation_id": message.GetCorrelation(),
 		"message":        message,
 	}).Info(`Incoming request`)
 
 	// Create a async job
-	err := w.job.CreateRecord(model.JobRecord{
+	err = w.job.CreateRecord(model.JobRecord{
 		ID:     message.JobID,
 		Action: model.DestroyJob,
 		Service: model.ServiceRecord{
@@ -263,16 +210,27 @@ func (w *Workers) ProcessRequest(notifyChannel chan<- Message, wg *sync.WaitGrou
 		switch message.GetType() {
 		case "DeployRequest":
 			// Deploy the service
-			err = w.containerization.Deploy(model.ServiceRecord{
+			depr := DeployRequest{}
+			result := make(map[string]string)
+
+			result, err = w.containerization.Deploy(model.ServiceRecord{
 				ID:          message.(DeployRequest).ServiceID,
 				Template:    message.(DeployRequest).Template,
 				Configs:     message.(DeployRequest).Configs,
 				DeleteAfter: message.(DeployRequest).DeleteAfter,
 			})
+
+			// Override configs
+			depr = message.(DeployRequest)
+			depr.Configs = result
+			message = depr
 		case "DestroyRequest":
 			// Destroy the service
 			err = w.containerization.Destroy(model.ServiceRecord{
-				ID: message.(DestroyRequest).ServiceID,
+				ID:          message.(DestroyRequest).ServiceID,
+				Template:    message.(DestroyRequest).Template,
+				Configs:     message.(DestroyRequest).Configs,
+				DeleteAfter: message.(DestroyRequest).DeleteAfter,
 			})
 		default:
 			log.WithFields(log.Fields{

diff --git a/core/definition/redis.go b/core/definition/redis.go
@@ -10,7 +10,9 @@ import (
 
 const (
 	// RedisPort const
-	RedisPort = "6379"
+	RedisPort      = "6379"
+	RedisPortStart = 6300
+	RedisPortEnd   = 6400
 )
 
 // GetRedisConfig gets yaml definition object

diff --git a/core/model/service.go b/core/model/service.go
@@ -38,7 +38,6 @@ type Service struct {
 
 // GetConfig get a config value
 func (s *ServiceRecord) GetConfig(key, def string) string {
-
 	if val, ok := s.Configs[key]; ok {
 		return val
 	}

diff --git a/core/runtime/base.go b/core/runtime/base.go
@@ -15,6 +15,6 @@ const (
 
 // Containerization interface
 type Containerization interface {
-	Deploy(service model.ServiceRecord) error
+	Deploy(service model.ServiceRecord) (map[string]string, error)
 	Destroy(service model.ServiceRecord) error
 }
diff --git a/core/runtime/docker_compose.go b/core/runtime/docker_compose.go
@@ -6,6 +6,7 @@ package runtime
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/clivern/peanut/core/definition"
 	"github.com/clivern/peanut/core/model"
@@ -26,25 +27,109 @@ func NewDockerCompose() *DockerCompose {
 }
 
 // Deploy deploys services
-func (d *DockerCompose) Deploy(service model.ServiceRecord) error {
+func (d *DockerCompose) Deploy(service model.ServiceRecord) (map[string]string, error) {
+	data := make(map[string]string)
+
 	// Deploy redis service
 	if model.RedisService == service.Template {
 		return d.deployRedis(service)
 	}
 
-	return nil
+	return data, fmt.Errorf("Error! Undefined service")
 }
 
 // Destroy destroys services
 func (d *DockerCompose) Destroy(service model.ServiceRecord) error {
+	if model.RedisService == service.Template {
+		return d.destroyRedis(service)
+	}
+
 	return nil
 }
 
 // deployRedis deploys a redis
-func (d *DockerCompose) deployRedis(service model.ServiceRecord) error {
+func (d *DockerCompose) deployRedis(service model.ServiceRecord) (map[string]string, error) {
+	data := make(map[string]string)
+
+	if service.Configs != nil {
+		data = service.Configs
+	}
+
+	data["address"] = "[NodeIp]"
+	data["port"] = service.GetConfig("port", strconv.Itoa(util.Rand(
+		definition.RedisPortStart,
+		definition.RedisPortEnd,
+	)))
+
+	data["password"] = service.GetConfig("password", "")
+
 	redis := definition.GetRedisConfig(
 		service.GetConfig("image", RedisDockerImage),
-		service.GetConfig("port", definition.RedisPort),
+		data["port"],
+		service.GetConfig("restartPolicy", "unless-stopped"),
+		data["password"],
+	)
+
+	result, err := redis.ToString()
+
+	if err != nil {
+		return data, err
+	}
+
+	err = util.StoreFile(
+		fmt.Sprintf("%s/%s.yml", viper.GetString("app.storage.path"), service.ID),
+		result,
+	)
+
+	if err != nil {
+		return data, err
+	}
+
+	command := fmt.Sprintf(
+		"docker-compose -f %s/%s.yml up -d --force-recreate",
+		viper.GetString("app.storage.path"),
+		service.ID,
+	)
+
+	stdout, stderr, err := util.Exec(command)
+
+	log.WithFields(log.Fields{
+		"command": command,
+	}).Info("Run a shell command")
+
+	if err != nil {
+		return data, err
+	}
+
+	// Store runtime verbose logs only in dev environment
+	if viper.GetString("app.mode") == "dev" {
+		err = util.StoreFile(
+			fmt.Sprintf("%s/%s.stdout.log", viper.GetString("app.storage.path"), service.ID),
+			stdout,
+		)
+
+		if err != nil {
+			return data, err
+		}
+
+		err = util.StoreFile(
+			fmt.Sprintf("%s/%s.stderr.log", viper.GetString("app.storage.path"), service.ID),
+			stderr,
+		)
+
+		if err != nil {
+			return data, err
+		}
+	}
+
+	return data, nil
+}
+
+// destroyRedis destroys redis
+func (d *DockerCompose) destroyRedis(service model.ServiceRecord) error {
+	redis := definition.GetRedisConfig(
+		service.GetConfig("image", RedisDockerImage),
+		service.GetConfig("port", ""),
 		service.GetConfig("restartPolicy", "unless-stopped"),
 		service.GetConfig("password", ""),
 	)
@@ -65,7 +150,7 @@ func (d *DockerCompose) deployRedis(service model.ServiceRecord) error {
 	}
 
 	command := fmt.Sprintf(
-		"docker-compose -f %s/%s.yml up -d --force-recreate",
+		"docker-compose -f %s/%s.yml down --rmi all --remove-orphans",
 		viper.GetString("app.storage.path"),
 		service.ID,
 	)