changed logs

Dockerfile

@@ -1,20 +1,23 @@
-FROM golang:alpine AS builder
+FROM golang:alpine AS deps
 
 WORKDIR /app
+COPY go.mod go.sum ./
+RUN sed -i '/replace/d' go.mod
+RUN go mod download -x
+
+#----------------------------------------------------------------------------------------------
+
+FROM golang:alpine AS builder
+LABEL maintainer="IRT PFN"
+ENV DOCKER_ENVIRONMENT=true
+WORKDIR /app
+
+COPY --from=deps /go/pkg /go/pkg
+COPY --from=deps /app/go.mod /app/go.sum ./
 
 COPY . .
 
-RUN apk add git
-
-RUN go get github.com/beego/bee/v2 && go install github.com/beego/bee/v2@master
-
-RUN timeout 15 bee run -gendoc=true -downdoc=true -runmode=dev || :
-
-RUN sed -i 's/http:\/\/127.0.0.1:8080\/swagger\/swagger.json/swagger.json/g' swagger/index.html
-
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" .
-
-RUN ls /app
+RUN go build .
 
 FROM scratch
 

Makefile

@@ -0,0 +1,27 @@
+.DEFAULT_GOAL := all
+
+build: clean
+	go build .
+
+dev: build
+
+run:
+	./oc-monitord
+
+clean:
+	rm -rf oc-monitord
+
+docker:
+	DOCKER_BUILDKIT=1 docker build -t oc/oc-monitord:0.0.1 -f Dockerfile .
+	docker tag oc/oc-monitord:0.0.1 oc/oc-monitord:latest
+	docker tag oc/oc-monitord:0.0.1 oc-monitord:latest
+
+publish-kind:
+	kind load docker-image oc/oc-monitord:0.0.1 --name opencloud
+
+publish-registry:
+	@echo "TODO"
+
+all: docker publish-kind publish-registry
+
+.PHONY: build run clean docker publish-kind publish-registry

README.md

@@ -1,5 +1,8 @@
 # oc-monitor
 
+DO :
+  make build
+
 ## Deploy in k8s (dev)
 
 While a registry with all of the OC docker images has not been set-up we can export this image to k3s ctr
@@ -62,3 +65,4 @@ This command **must return "yes"**
 - Test wether ingress-nginx is running or not
   - Do something if not found : stop running and send error log OR start installation
 - 
+

docker_schedulerd.json

@@ -1,8 +1,5 @@
 {
     "MONGO_URL":"mongodb://mongo:27017/", 
     "NATS_URL":"nats://nats:4222",
-    "MONGO_DATABASE":"DC_myDC",
-    "KUBERNETES_SERVICE_HOST" : "193.50.43.14",
-    "KUBE_CA" : "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJWUxWNkFPQkdrU1F3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOekl6TVRFeU1ETTJNQjRYRFRJME1EZ3dPREV3TVRNMU5sb1hEVEkxTURndwpPREV3TVRNMU5sb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJGQ2Q1MFdPeWdlQ2syQzcKV2FrOWY4MVAvSkJieVRIajRWOXBsTEo0ck5HeHFtSjJOb2xROFYxdUx5RjBtOTQ2Nkc0RmRDQ2dqaXFVSk92Swp3NVRPNnd5alNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFJkOFI5cXVWK2pjeUVmL0ovT1hQSzMyS09XekFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQTArbThqTDBJVldvUTZ0dnB4cFo4NVlMalF1SmpwdXM0aDdnSXRxS3NmUVVDSUI2M2ZNdzFBMm5OVWU1TgpIUGZOcEQwSEtwcVN0Wnk4djIyVzliYlJUNklZCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTWpNeE1USXdNell3SGhjTk1qUXdPREE0TVRBeE16VTJXaGNOTXpRd09EQTJNVEF4TXpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTWpNeE1USXdNell3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFRc3hXWk9pbnIrcVp4TmFEQjVGMGsvTDF5cE01VHAxOFRaeU92ektJazQKRTFsZWVqUm9STW0zNmhPeVljbnN3d3JoNnhSUnBpMW5RdGhyMzg0S0Z6MlBvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVTBYZkVmYXJsZm8zTWhIL3lmemx6Cnl0OWlqbHN3Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUxJL2dNYnNMT3MvUUpJa3U2WHVpRVMwTEE2cEJHMXgKcnBlTnpGdlZOekZsQWlFQW1wdjBubjZqN3M0MVI0QzFNMEpSL0djNE53MHdldlFmZWdEVGF1R2p3cFk9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
-    "KUBE_TOKEN":"LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU5ZS1BFb1dhd1NKUzJlRW5oWmlYMk5VZlY1ZlhKV2krSVNnV09TNFE5VTlvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFVUozblJZN0tCNEtUWUx0WnFUMS96VS84a0Z2Sk1lUGhYMm1Vc25pczBiR3FZblkyaVZEeApYVzR2SVhTYjNqcm9iZ1YwSUtDT0twUWs2OHJEbE03ckRBPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo="
+    "MONGO_DATABASE":"DC_myDC"
 }

go.mod

@@ -5,8 +5,9 @@ go 1.23.1
 toolchain go1.23.3
 
 require (
-	cloud.o-forge.io/core/oc-lib v0.0.0-20250213085018-271cc2caa026
+	cloud.o-forge.io/core/oc-lib v0.0.0-20250313155727-88c88cac5bc9
 	github.com/akamensky/argparse v1.4.0
+	github.com/google/uuid v1.6.0
 	github.com/goraz/onion v0.1.3
 	github.com/nwtgck/go-fakelish v0.1.3
 	github.com/rs/zerolog v1.33.0
@@ -46,7 +47,6 @@ require (
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.6.0
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect

go.sum

@@ -1,13 +1,35 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.o-forge.io/core/oc-lib v0.0.0-20250211143301-a098b3797a0f h1:irUdoi0U19KJaG8pn6ahJgD3hJAGYpzNpLonAGdqzIc=
-cloud.o-forge.io/core/oc-lib v0.0.0-20250211143301-a098b3797a0f/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
-cloud.o-forge.io/core/oc-lib v0.0.0-20250212150815-c7c1535ba91a h1:kfTSMCOxYiVGNJWD4OrV7YYTf6t4geKxWpGz4EucpEA=
-cloud.o-forge.io/core/oc-lib v0.0.0-20250212150815-c7c1535ba91a/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
-cloud.o-forge.io/core/oc-lib v0.0.0-20250213072626-4920322d0afb h1:EybP8jPpIiN5RLiBxr3cvvF9KIaC+uWvzM23ga0t1yI=
-cloud.o-forge.io/core/oc-lib v0.0.0-20250213072626-4920322d0afb/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
 cloud.o-forge.io/core/oc-lib v0.0.0-20250213085018-271cc2caa026 h1:CYwpofGfpAhMDrT6jqvu9NI/tcgxCD8PKJZDKEfTvVI=
 cloud.o-forge.io/core/oc-lib v0.0.0-20250213085018-271cc2caa026/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250213093249-c53e25e69a7b h1:HAb2h0011mE3QrHdOwJCua5w0r/BDOFLNb/557ZAzL0=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250213093249-c53e25e69a7b/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250217072519-cafadec1469f h1:esLB0EAn8IuOChW35kcBrPaN80z4A4yYyz1mXT45GQo=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250217072519-cafadec1469f/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218080121-a098f0a672ee h1:UIGIiE+O5LUrP18C8nrZxN1v6Lmzfdlv8pvHnSLKJz8=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218080121-a098f0a672ee/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218085355-6e6ed4ea2c64 h1:dANQHoMCyp3uioCHnUOpLFiG/UO+biyPUoSelDNJ814=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218085355-6e6ed4ea2c64/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218092508-b771b5d25ee5 h1:EwoctMKdVG1PJHRcBcRKCxgdAxy+TV1T617vxIZwkio=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218092508-b771b5d25ee5/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218101140-6bf058ab5ca4 h1:7om8VD4ZivHA2BKBwvqM98/a7D+MTwppd2FloNBg1Y4=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218101140-6bf058ab5ca4/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218113916-04f7537066c1 h1:on0zLtHo1Jj6FvQ/wuJCc/sxfBfgrd2qTFknpDh3wQM=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218113916-04f7537066c1/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218115549-81d3406305c5 h1:DP/XYrxSOc5ORMGvVNqTvFjxLF4cymUW/d3HIZXKDEk=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218115549-81d3406305c5/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218130229-7c30633bded0 h1:3EsRmeTz6OWHJETrPObctnGF8WgZtXHfwL2cjyHcfOk=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218130229-7c30633bded0/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219075511-241c6a5a0861 h1:XqTFKSZ8hXGCJbuu/SBwakpftevg1AKV7hDI50cXNUg=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219075511-241c6a5a0861/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219100312-b4a176667754 h1:7J5EUe/iNS6cT6KVDklpgGH7ak30iEFgWJDEPF6wik4=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219100312-b4a176667754/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219104152-3ecb0e9d960b h1:DhRqJdw2VePaYVlsh8OUA3zl+76Q0FWwGu+a+3aOf6s=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219104152-3ecb0e9d960b/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219142942-5111c9c8bec7 h1:fh6SzBPenzIxufIIzExtx4jEE4OhFposqn3EbHFr92Q=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219142942-5111c9c8bec7/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250313155727-88c88cac5bc9 h1:mSFFPwil5Ih+RPBvn88MBerQMtsoHnOuyCZQaf91a34=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250313155727-88c88cac5bc9/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=

main.go

@@ -84,10 +84,11 @@ func main() {
 
 	err := new_wf.LoadFrom(conf.GetConfig().WorkflowID, conf.GetConfig().PeerID)
 	if err != nil {
+		
 		logger.Error().Msg("Could not retrieve workflow " + conf.GetConfig().WorkflowID + " from oc-catalog API")
 	}
 
-	argo_file_path, stepMax, err := new_wf.ExportToArgo(exec.ExecutionsID, conf.GetConfig().Timeout)
+	builder, argo_file_path, stepMax, err := new_wf.ExportToArgo(exec.ExecutionsID, conf.GetConfig().Timeout)
 	if err != nil {
 		logger.Error().Msg("Could not create the Argo file for " + conf.GetConfig().WorkflowID)
 		logger.Error().Msg(err.Error())
@@ -99,15 +100,20 @@ func main() {
 	wf_logger = logger.With().Str("argo_name", workflowName).Str("workflow_id", conf.GetConfig().WorkflowID).Str("workflow_execution_id", conf.GetConfig().ExecutionID).Logger()
 	wf_logger.Debug().Msg("Testing argo name")
 
-	if conf.GetConfig().KubeHost == "" {
-		// Not in a k8s environment, get conf from parameters
-		fmt.Println("Executes outside of k8s")
-		executeOutside(argo_file_path, stepMax)
-	} else {
-		// Executed in a k8s environment
-		fmt.Println("Executes inside a k8s")
-		executeInside(exec.GetID(), "argo", argo_file_path, stepMax)
+	err = builder.CompleteBuild(exec.ExecutionsID)
+	if err != nil {
+		logger.Error().Msg(err.Error())
 	}
+	_ = stepMax
+	// if conf.GetConfig().KubeHost == "" {
+	// 	// Not in a k8s environment, get conf from parameters
+	// 	fmt.Println("Executes outside of k8s")
+	// 	executeOutside(argo_file_path, stepMax)
+	// } else {
+	// 	// Executed in a k8s environment
+	// 	fmt.Println("Executes inside a k8s")
+	// 	executeInside(exec.GetID(), "argo", argo_file_path, stepMax)
+	// }
 }
 
 // So far we only log the output from
@@ -191,7 +197,7 @@ func logWorkflow(argo_file_path string, stepMax int, pipe io.ReadCloser,
 			}
 		}
 		if !slices.Contains(current_watch.Logs, log) {
-			current_watch.Logs = append(current_watch.Logs, log)
+			current_watch.Logs = append(current_watch.Logs, strings.ReplaceAll(log, "\"", ""))
 		}
 		count++
 		if strings.Contains(log, "sub-process exited") {
@@ -224,9 +230,9 @@ func loadConfig(is_k8s bool, parser *argparse.Parser) {
 	o = initOnion(o)
 	setConf(is_k8s, o, parser)
 
-	if !IsValidUUID(conf.GetConfig().ExecutionID) {
-		logger.Fatal().Msg("Provided ID is not an UUID")
-	}
+	// if !IsValidUUID(conf.GetConfig().ExecutionID) {
+	// 	logger.Fatal().Msg("Provided ID is not an UUID")
+	// }
 }
 
 func setConf(is_k8s bool, o *onion.Onion, parser *argparse.Parser) {

models/template.go

@@ -95,7 +95,7 @@ type Template struct {
 	Resource  ServiceResource  `yaml:"resource,omitempty"`
 }
 
-func (template *Template) CreateContainer(processing *resources.ProcessingResource, dag *Dag, templateName string) {
+func (template *Template) CreateContainer(processing *resources.ProcessingResource, dag *Dag) {
 	instance := processing.GetSelectedInstance()
 	if instance == nil {
 		return
@@ -116,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))
 	}
@@ -124,6 +124,7 @@ func (template *Template) CreateContainer(processing *resources.ProcessingResour
 		container.Args = append(container.Args, template.ReplacePerEnv(a, inst.Env))
 	}
 	container.Args = []string{strings.Join(container.Args, " ")}
+
 	template.Container = container
 }
 

swagger/index.html

@@ -1,60 +0,0 @@
-<!-- HTML for static distribution bundle build -->
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8">
-    <title>Swagger UI</title>
-    <link rel="stylesheet" type="text/css" href="./swagger-ui.css" />
-    <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
-    <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
-    <style>
-      html
-      {
-        box-sizing: border-box;
-        overflow: -moz-scrollbars-vertical;
-        overflow-y: scroll;
-      }
-
-      *,
-      *:before,
-      *:after
-      {
-        box-sizing: inherit;
-      }
-
-      body
-      {
-        margin:0;
-        background: #fafafa;
-      }
-    </style>
-  </head>
-
-  <body>
-    <div id="swagger-ui"></div>
-
-    <script src="./swagger-ui-bundle.js" charset="UTF-8"> </script>
-    <script src="./swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
-    <script>
-    window.onload = function() {
-      // Begin Swagger UI call region
-      const ui = SwaggerUIBundle({
-        url: "https://petstore.swagger.io/v2/swagger.json",
-        dom_id: '#swagger-ui',
-        deepLinking: true,
-        presets: [
-          SwaggerUIBundle.presets.apis,
-          SwaggerUIStandalonePreset
-        ],
-        plugins: [
-          SwaggerUIBundle.plugins.DownloadUrl
-        ],
-        layout: "StandaloneLayout"
-      });
-      // End Swagger UI call region
-
-      window.ui = ui;
-    };
-  </script>
-  </body>
-</html>

swagger/oauth2-redirect.html

@@ -1,79 +0,0 @@
-<!doctype html>
-<html lang="en-US">
-<head>
-    <title>Swagger UI: OAuth2 Redirect</title>
-</head>
-<body>
-<script>
-    'use strict';
-    function run () {
-        var oauth2 = window.opener.swaggerUIRedirectOauth2;
-        var sentState = oauth2.state;
-        var redirectUrl = oauth2.redirectUrl;
-        var isValid, qp, arr;
-
-        if (/code|token|error/.test(window.location.hash)) {
-            qp = window.location.hash.substring(1);
-        } else {
-            qp = location.search.substring(1);
-        }
-
-        arr = qp.split("&");
-        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';});
-        qp = qp ? JSON.parse('{' + arr.join() + '}',
-                function (key, value) {
-                    return key === "" ? value : decodeURIComponent(value);
-                }
-        ) : {};
-
-        isValid = qp.state === sentState;
-
-        if ((
-          oauth2.auth.schema.get("flow") === "accessCode" ||
-          oauth2.auth.schema.get("flow") === "authorizationCode" ||
-          oauth2.auth.schema.get("flow") === "authorization_code"
-        ) && !oauth2.auth.code) {
-            if (!isValid) {
-                oauth2.errCb({
-                    authId: oauth2.auth.name,
-                    source: "auth",
-                    level: "warning",
-                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
-                });
-            }
-
-            if (qp.code) {
-                delete oauth2.state;
-                oauth2.auth.code = qp.code;
-                oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
-            } else {
-                let oauthErrorMsg;
-                if (qp.error) {
-                    oauthErrorMsg = "["+qp.error+"]: " +
-                        (qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
-                        (qp.error_uri ? "More info: "+qp.error_uri : "");
-                }
-
-                oauth2.errCb({
-                    authId: oauth2.auth.name,
-                    source: "auth",
-                    level: "error",
-                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
-                });
-            }
-        } else {
-            oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid, redirectUrl: redirectUrl});
-        }
-        window.close();
-    }
-
-    if (document.readyState !== 'loading') {
-        run();
-    } else {
-        document.addEventListener('DOMContentLoaded', function () {
-            run();
-        });
-    }
-</script>
-</body>
-</html>

tools/kubernetes.go

@@ -64,7 +64,7 @@ func (k *KubernetesTools) LogWorkflow(execID string, namespace string, workflowN
 	if exec == nil {
 		return errors.New("Could not retrieve workflow ID from execution ID " + execID)
 	}
-	if exec.State != enum.SCHEDULED {
+	if exec.State == enum.DRAFT || exec.State == enum.FAILURE || exec.State == enum.SUCCESS {
 		return nil
 	}
 	k.logWorkflow(namespace, workflowName, argoFilePath, stepMax, current_watch, previous_watch, argoLogs, seen, logFunc)

workflow_builder/admiralty_setter.go

@@ -0,0 +1,98 @@
+package workflow_builder
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	oclib "cloud.o-forge.io/core/oc-lib"
+	"cloud.o-forge.io/core/oc-lib/models/peer"
+	"cloud.o-forge.io/core/oc-lib/tools"
+)
+
+type AdmiraltySetter struct {
+	Id	string		// ID to identify the execution, correspond to workflow_executions id
+}
+
+func (s *AdmiraltySetter) InitializeAdmiralty(localPeerID string,remotePeerID string) error {
+	
+	data := oclib.NewRequest(oclib.LibDataEnum(oclib.PEER),"",localPeerID,nil,nil).LoadOne(remotePeerID)
+	if data.Code != 200 {
+		logger.Error().Msg("Error while trying to instantiate remote peer " + remotePeerID)
+		return fmt.Errorf(data.Err)
+	}
+	remotePeer := data.ToPeer()
+
+	data = oclib.NewRequest(oclib.LibDataEnum(oclib.PEER),"",localPeerID,nil,nil).LoadOne(localPeerID)
+	if data.Code != 200 {
+		logger.Error().Msg("Error while trying to instantiate local peer " + remotePeerID)
+		return fmt.Errorf(data.Err)
+	}
+	localPeer := data.ToPeer()
+
+	caller := tools.NewHTTPCaller(
+		map[tools.DataType]map[tools.METHOD]string{
+			tools.ADMIRALTY_SOURCE: {
+				tools.POST :"/:id",
+			},
+			tools.ADMIRALTY_KUBECONFIG: {
+				tools.GET:"/:id",
+			},
+			tools.ADMIRALTY_SECRET: {
+				tools.POST:"/:id",
+			},
+			tools.ADMIRALTY_TARGET: {
+				tools.POST:"/:id",
+			},
+			tools.ADMIRALTY_NODES: {
+				tools.GET:"/:id",
+			},
+		},
+	)
+
+	logger.Info().Msg(" Creating the Admiralty Source on " + remotePeerID + " ns-" + s.Id + "\n\n")
+	_ = s.callRemoteExecution(remotePeer, http.StatusCreated,caller, s.Id, tools.ADMIRALTY_SOURCE, tools.POST, nil)
+	logger.Info().Msg(" Retrieving kubeconfig with the secret on " + remotePeerID + " ns-" + s.Id + "\n\n")
+	kubeconfig := s.getKubeconfig(remotePeer, caller)
+	logger.Info().Msg(" Creating a secret from the kubeconfig " + localPeerID + " ns-" + s.Id + "\n\n")
+	_ = s.callRemoteExecution(localPeer, http.StatusCreated, caller,s.Id, tools.ADMIRALTY_SECRET, tools.POST,kubeconfig)
+	logger.Info().Msg(" Creating the Admiralty Target on " + localPeerID + " ns-" + s.Id + "\n\n")
+	_ = s.callRemoteExecution(localPeer,http.StatusCreated,caller,s.Id,tools.ADMIRALTY_TARGET,tools.POST, nil)
+	logger.Info().Msg(" Checking for the creation of the admiralty node on " + localPeerID + " ns-" + s.Id + "\n\n")
+	_ = s.callRemoteExecution(localPeer,http.StatusOK,caller,s.Id,tools.ADMIRALTY_NODES,tools.GET, nil)
+	
+	return nil
+}
+
+func (s *AdmiraltySetter) getKubeconfig(peer *peer.Peer, caller *tools.HTTPCaller) map[string]string {
+	var kubedata map[string]string
+	_ = s.callRemoteExecution(peer, http.StatusOK, caller, s.Id, tools.ADMIRALTY_KUBECONFIG, tools.GET, nil)
+	if caller.LastResults["body"] == nil || len(caller.LastResults["body"].([]byte)) == 0 {
+		fmt.Println("Something went wrong when retrieving data from Get call for kubeconfig")
+		panic(0)
+	}
+	err := json.Unmarshal(caller.LastResults["body"].([]byte), &kubedata)
+	if err != nil {
+		fmt.Println("Something went wrong when unmarshalling data from Get call for kubeconfig")
+		panic(0)
+	}
+
+	return kubedata
+}
+
+func (*AdmiraltySetter) callRemoteExecution(peer *peer.Peer, expectedCode int,caller *tools.HTTPCaller, dataID string, dt tools.DataType, method tools.METHOD, body interface{}) *peer.PeerExecution {
+	resp, err := peer.LaunchPeerExecution(peer.UUID, dataID, dt, method, body, caller)
+	if err != nil {
+		fmt.Println("Error when executing on peer at", peer.Url)
+		fmt.Println(err)
+		panic(0)
+	}
+
+	if caller.LastResults["code"].(int) != expectedCode {
+		fmt.Println("Didn't receive the expected code :", caller.LastResults["code"], "when expecting", expectedCode)
+		fmt.Println(string(caller.LastResults["body"].(byte)))
+		panic(0)
+	}
+
+	return resp
+}

workflow_builder/argo_builder.go

@@ -29,6 +29,7 @@ type ArgoBuilder struct {
 	Workflow       	Workflow
 	Services       	[]*Service
 	Timeout        	int
+	RemotePeers		[]string
 }
 
 type Workflow struct {
@@ -187,7 +188,11 @@ func (b *ArgoBuilder) createArgoTemplates(namespace string,
 	_, firstItems, lastItems = b.addTaskToArgo(b.Workflow.getDag(), id, processing, firstItems, lastItems)
 	template := &Template{Name: getArgoName(processing.GetName(), id)}
 	fmt.Println("Creating template for", template.Name)
-	template.CreateContainer(processing, b.Workflow.getDag(), template.Name)
+	isReparted, peerId := b.isProcessingReparted(*processing,id)
+	template.CreateContainer(processing, b.Workflow.getDag())
+	if isReparted {
+		b.RemotePeers = append(b.RemotePeers, peerId)
+	}
 	// get datacenter from the processing
 	if processing.IsService {
 		b.CreateService(id, processing)
@@ -266,6 +271,7 @@ func (b *ArgoBuilder) createArgoTemplates(namespace string,
 	b.Workflow.Spec.Templates = append(b.Workflow.Spec.Templates, *template)
 	return volumes, firstItems, lastItems
 }
+
 func (b *ArgoBuilder) addTaskToArgo(dag *Dag, graphItemID string, processing *resources.ProcessingResource,
 	firstItems []string, lastItems []string) (*Dag, []string, []string) {
 	unique_name := getArgoName(processing.GetName(), graphItemID)
@@ -368,3 +374,71 @@ func getArgoName(raw_name string, component_id string) (formatedName string) {
 	formatedName = strings.ToLower(formatedName)
 	return
 }
+
+// Verify if a processing resource is attached to another Compute than the one hosting
+// the current Open Cloud instance. If true return the peer ID to contact
+func (b *ArgoBuilder) isProcessingReparted(processing resources.ProcessingResource, graphID string) (bool,string) {
+	computeAttached := b.retrieveProcessingCompute(graphID)
+	if computeAttached == nil {
+		logger.Error().Msg("No compute was found attached to processing " + processing.Name + " : " + processing.UUID )
+		panic(0)
+	}
+
+	
+	// Creates an accessor srtictly for Peer Collection 
+	req := oclib.NewRequest(oclib.LibDataEnum(oclib.PEER),"","",nil,nil)
+	if req == nil {
+		fmt.Println("TODO : handle error when trying to create a request on the Peer Collection")
+		return false, ""
+	} 
+
+	res := req.LoadOne(computeAttached.CreatorID)
+	if res.Err != "" {
+		fmt.Print("TODO : handle error when requesting PeerID")
+		fmt.Print(res.Err)
+		return false, ""
+	}
+	
+	peer := *res.ToPeer()
+
+	isNotReparted, _ := peer.IsMySelf()
+	fmt.Println("Result IsMySelf for ", peer.UUID ," : ", isNotReparted)
+	
+	return !isNotReparted, peer.UUID
+}
+
+func (b *ArgoBuilder) retrieveProcessingCompute(graphID string) *resources.ComputeResource {
+	for _, link := range b.OriginWorkflow.Graph.Links {
+		// If a link contains the id of the processing
+		var oppositeId string 
+		if link.Source.ID == graphID{
+			oppositeId = link.Destination.ID
+		} else if(link.Destination.ID == graphID){
+			oppositeId = link.Source.ID
+		}
+		fmt.Println("OppositeId : ", oppositeId)
+		if oppositeId != "" {
+			dt, res := b.OriginWorkflow.Graph.GetResource(oppositeId)
+			if dt == oclib.COMPUTE_RESOURCE {
+				return res.(*resources.ComputeResource)
+			} else {
+				continue
+			}
+		}
+
+	}
+		
+	return nil 
+}
+
+
+// Execute the last actions once the YAML file for the Argo Workflow is created
+func (b *ArgoBuilder) CompleteBuild(executionsId string) error {
+	fmt.Println("DEV :: Completing build")
+	for _, peer := range b.RemotePeers {
+		fmt.Println("DEV :: Launching Admiralty Setup for ", peer)
+		setter := AdmiraltySetter{Id: executionsId}
+		setter.InitializeAdmiralty(conf.GetConfig().PeerID,peer)
+	}
+	return nil
+}

workflow_builder/graph.go

@@ -41,20 +41,20 @@ func (w *WorflowDB) getWorkflow(workflow_id string, peerID string) (workflow *wo
 	return new_wf, nil
 }
 
-func (w *WorflowDB) ExportToArgo(namespace string, timeout int) (string, int, error) {
+func (w *WorflowDB) ExportToArgo(namespace string, timeout int) (*ArgoBuilder,string, int, error) {
 	logger := oclib.GetLogger()
 	fmt.Println("Exporting to Argo", w.Workflow)
 	if len(w.Workflow.Name) == 0 || w.Workflow.Graph == nil {
-		return "", 0, fmt.Errorf("can't export a graph that has not been loaded yet")
+		return nil, "", 0, fmt.Errorf("can't export a graph that has not been loaded yet")
 	}
 
-	argo_builder := ArgoBuilder{OriginWorkflow: w.Workflow, Timeout: timeout}
-	filename, stepMax, _, _, err := argo_builder.CreateDAG(namespace, true)
+	argoBuilder := ArgoBuilder{OriginWorkflow: w.Workflow, Timeout: timeout}
+	filename, stepMax, _, _, err := argoBuilder.CreateDAG(namespace, true)
 	if err != nil {
 		logger.Error().Msg("Could not create the argo file for " + w.Workflow.Name)
-		return "", 0, err
+		return nil, "", 0, err
 	}
-	return filename, stepMax, nil
+	return &argoBuilder, filename, stepMax, nil
 }
 
 // TODO implement this function