Merge branch 'main' of https://cloud.o-forge.io/core/oc-monitord into feature/admiralty

models/argo_logs.go

@@ -1,12 +1,14 @@
 package models
 
 import (
+	"encoding/json"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/acarl005/stripansi"
+	"github.com/rs/zerolog"
 )
 
 type ArgoWatch struct {
@@ -41,6 +43,7 @@ func NewArgoLogs(name string, namespace string, stepMax int) *ArgoLogs {
 		StepCount:   0,
 		StepMax:     stepMax,
 		stop:        false,
+		Seen:        []string{},
 	}
 }
 
@@ -52,19 +55,42 @@ type ArgoLogs struct {
 	StepMax     int
 	stop        bool
 	Started     time.Time
+	Seen        []string
+	Logs        []string
+	IsStreaming bool
 }
 
-func (a *ArgoLogs) StartStepRecording() {
+func (a *ArgoLogs) NewWatch() *ArgoWatch {
+	return &ArgoWatch{
+		Name:      a.Name,
+		Namespace: a.Namespace,
+		Status:    "Pending",
+		Created:   a.CreatedDate,
+		Started:   a.Started.Format("2006-01-02 15:04:05"),
+		Conditions: Conditions{
+			PodRunning: a.StepCount > 0 && a.StepCount < a.StepMax,
+			Completed:  a.StepCount == a.StepMax,
+		},
+		Progress: fmt.Sprintf("%v/%v", a.StepCount, a.StepMax),
+		Duration: "0s",
+		Logs:     []string{},
+	}
+
+}
+
+func (a *ArgoLogs) StartStepRecording(current_watch *ArgoWatch, logger zerolog.Logger) {
+	jsonified, _ := json.Marshal(current_watch)
+	logger.Info().Msg(string(jsonified))
 	a.StepCount += 1
 	a.Started = time.Now()
 }
 
-func (a *ArgoLogs) StopStepRecording(inputs []string) *ArgoWatch {
+func (a *ArgoLogs) StopStepRecording(current *ArgoWatch) *ArgoWatch {
 	fn := strings.Split(a.Name, "_")
 	logs := []string{}
 	err := false
 	end := ""
-	for _, input := range inputs {
+	for _, input := range current.Logs {
 		line := strings.TrimSpace(input)
 		if line == "" || !strings.Contains(line, fn[0]) || !strings.Contains(line, ":") {
 			continue
@@ -107,22 +133,13 @@ func (a *ArgoLogs) StopStepRecording(inputs []string) *ArgoWatch {
 		timeE, _ := time.Parse("2006-01-02T15:04:05", end)
 		duration = timeE.Sub(a.Started).Seconds()
 	}
-	argo := &ArgoWatch{
-		Name:      a.Name,
-		Namespace: a.Namespace,
-		Status:    status,
-		Created:   a.CreatedDate,
-		Started:   a.Started.Format("2006-01-02 15:04:05"),
-		Conditions: Conditions{
-			PodRunning: a.StepCount > 0 && a.StepCount < a.StepMax,
-			Completed:  a.StepCount == a.StepMax,
-		},
-		Progress: fmt.Sprintf("%v/%v", a.StepCount, a.StepMax),
-		Duration: fmt.Sprintf("%v", fmt.Sprintf("%.2f", duration)+"s"),
-		Logs:     logs,
+	current.Conditions = Conditions{
+		PodRunning: a.StepCount > 0 && a.StepCount < a.StepMax,
+		Completed:  a.StepCount == a.StepMax,
 	}
-	if !argo.Completed {
-		a.StartStepRecording()
-	}
-	return argo
+	current.Progress = fmt.Sprintf("%v/%v", a.StepCount, a.StepMax)
+	current.Duration = fmt.Sprintf("%v", fmt.Sprintf("%.2f", duration)+"s")
+
+	current.Status = status
+	return current
 }

models/template.go

@@ -60,8 +60,18 @@ type TemplateMetadata struct {
 	Labels map[string]string `yaml:"labels,omitempty"`
 }
 
+type Secret struct {
+	Name string `yaml:"name"`
+	Key  string `yaml:"key"`
+}
+
 type Key struct {
-	Key string `yaml:"key"`
+	Key             string  `yaml:"key"`
+	Bucket          string  `yaml:"bucket"`
+	EndPoint        string  `yaml:"endpoint"`
+	Insecure        bool    `yaml:"insecure"`
+	AccessKeySecret *Secret `yaml accessKeySecret`
+	SecretKeySecret *Secret `yaml secretKeySecret`
 }
 
 type Artifact struct {
@@ -106,7 +116,7 @@ func (template *Template) CreateContainer(processing *resources.ProcessingResour
 		template.Outputs.Parameters = append(template.Inputs.Parameters, Parameter{Name: v.Name})
 	}
 	cmd := strings.ReplaceAll(inst.Access.Container.Command, container.Image, "")
-
+	container.Args = append(container.Args, "echo "+templateName+" && ") // a casual echo to know where we are for logs purpose
 	for _, a := range strings.Split(cmd, " ") {
 		container.Args = append(container.Args, template.ReplacePerEnv(a, inst.Env))
 	}