Minimize code + docker + monitord naming

models/argo_logs.go

@@ -5,35 +5,34 @@ import (
 )
 
 type ArgoWatch struct {
-	Name		string
-	Namespace	string
-	Status		string
+	Name      string
+	Namespace string
+	Status    string
 	Conditions
-	Created		string
-	Started		string
-	Duration	string
-	Progress	string
+	Created  string
+	Started  string
+	Duration string
+	Progress string
 }
 
-type Conditions struct{
-	PodRunning	bool
-	Completed	bool
+type Conditions struct {
+	PodRunning bool
+	Completed  bool
 }
 
 func (a *ArgoWatch) Equals(arg ArgoWatch) bool {
 	return a.Status == arg.Status && a.Progress == arg.Progress && a.Conditions.PodRunning == arg.Conditions.PodRunning && a.Conditions.Completed == arg.Conditions.Completed
 }
 
-// Take the slice of string that make up one round of stderr outputs from the --watch option in argo submit 
+// Take the slice of string that make up one round of stderr outputs from the --watch option in argo submit
 func NewArgoLogs(inputs []string) *ArgoWatch {
 	var workflow ArgoWatch
-	
+
 	for _, input := range inputs {
 		line := strings.TrimSpace(input)
 		if line == "" {
 			continue
 		}
-
 		switch {
 		case strings.HasPrefix(line, "Name:"):
 			workflow.Name = parseValue(line)
@@ -70,4 +69,4 @@ func parseValue(line string) string {
 func parseBoolValue(line string) bool {
 	value := parseValue(line)
 	return value == "True"
-}
+}

models/http.go

@@ -1,53 +0,0 @@
-package models
-
-import (
-	"io"
-	"net/http"
-	"net/http/cookiejar"
-	"net/url"
-)
-
-type HttpQuery struct {
-	baseurl string
-	jar     http.CookieJar
-	Cookies map[string]string
-}
-
-func (h *HttpQuery) Init(url string) {
-	h.baseurl = url
-	h.jar, _ = cookiejar.New(nil)
-	h.Cookies = make(map[string]string)
-}
-
-func (h *HttpQuery) Get(url string) ([]byte, error) {
-	client := &http.Client{Jar: h.jar}
-	resp, err := client.Get(h.baseurl + url)
-	if err != nil {
-		return nil, err
-	}
-	// store received cookies
-	for _, cookie := range h.jar.Cookies(resp.Request.URL) {
-		h.Cookies[cookie.Name] = cookie.Value
-	}
-	if err != nil {
-		return nil, err
-	}
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-	return body, nil
-}
-
-func (h *HttpQuery) Post(url string, data url.Values) (*http.Response, error) {
-	client := &http.Client{Jar: h.jar}
-	resp, err := client.PostForm(h.baseurl+url, data)
-	if err != nil {
-		return nil, err
-	}
-	// store received cookies
-	for _, cookie := range h.jar.Cookies(resp.Request.URL) {
-		h.Cookies[cookie.Name] = cookie.Value
-	}
-	return resp, err
-}

models/schedule.go

@@ -1,74 +0,0 @@
-package models
-
-import (
-	"fmt"
-	"oc-monitor/logger"
-	"sync"
-	"time"
-)
-
-// Is duration really important ?
-
-type Booking struct {
-	Start		time.Time
-	Stop		time.Time
-	Duration	uint
-	Workflow	string
-}
-
-type ScheduledBooking struct {
-	Bookings	[]Booking
-	Mu			sync.Mutex
-}
-
-func (s Booking) Equals(other Booking) bool {
-    return s.Workflow == other.Workflow && s.Start == other.Start && s.Stop == other.Stop
-}
-
-func (sb *ScheduledBooking) AddSchedule(new_booking Booking){
-	if(!sb.scheduleAlreadyExists(new_booking)){
-		sb.Bookings = append(sb.Bookings,new_booking) 
-		logger.Logger.Info().Msg("Updated list schedules : \n " + sb.String())
-		
-		
-		
-	} else {
-		// Debug condition : delete once this feature is ready to be implemented
-		logger.Logger.Debug().Msg("Workflow received not added")
-		logger.Logger.Debug().Msg("current schedule contains")
-		for _, booking := range(sb.Bookings){
-			logger.Logger.Debug().Msg(booking.String())
-		}
-	}
-}
-
-func (sb *ScheduledBooking) GetListNames()(list_names []string ){
-	for _, schedule := range(sb.Bookings){
-		list_names = append(list_names, schedule.Workflow)
-	}
-
-	return
-}
-
-func (sb *ScheduledBooking) scheduleAlreadyExists(new_booking Booking) bool {
-	for _, booking :=  range(sb.Bookings){
-		if booking.Equals(new_booking){
-			return true
-		}
-	}
-	return false
-}
-
-func (b *Booking) String() string {
-	return fmt.Sprintf("{workflow : %s ,  start_date : %s ,  stop_date :  %s }", b.Workflow, b.Start.Format(time.RFC3339), b.Stop.Format(time.RFC3339))
-	
-}
-
-func (sb *ScheduledBooking) String() string {
-	var str string
-	for _, booking := range(sb.Bookings){
-		str += fmt.Sprintf("%s\n", booking.String())
-	}
-
-	return str
-}

models/template.go

@@ -31,8 +31,8 @@ type Dag struct {
 }
 
 type Template struct {
-	Name      string    `yaml:"name"`
-	Inputs    struct {
+	Name   string `yaml:"name"`
+	Inputs struct {
 		Parameters []Parameter `yaml:"parameters"`
 	} `yaml:"inputs,omitempty"`
 	Container Container `yaml:"container,omitempty"`

models/volume.go

@@ -0,0 +1,17 @@
+package models
+
+type VolumeClaimTemplate struct {
+	Metadata struct {
+		Name string `yaml:"name"`
+	} `yaml:"metadata"`
+	Spec VolumeSpec `yaml:"spec"`
+}
+
+type VolumeSpec struct {
+	AccessModes []string `yaml:"accessModes,flow"`
+	Resources   struct {
+		Requests struct {
+			Storage string `yaml:"storage"`
+		} `yaml:"requests"`
+	} `yaml:"resources"`
+}

models/volume_models.go

@@ -1,19 +0,0 @@
-package models
-
-
-
-type VolumeClaimTemplate struct {
-    Metadata struct {
-        Name string 	`yaml:"name"`
-    } 					`yaml:"metadata"`
-    Spec	VolumeSpec	`yaml:"spec"`
-}
-
-type VolumeSpec struct {
-	AccessModes []string 	`yaml:"accessModes,flow"`
-	Resources   struct {
-		Requests struct {
-			Storage string 	`yaml:"storage"`
-		} 					`yaml:"requests"`
-	} 						`yaml:"resources"`
-}