From 369a53a67279e04ed5ff99b56bb9a9f2d06ba3c4 Mon Sep 17 00:00:00 2001 From: mr Date: Mon, 2 Feb 2026 14:24:07 +0100 Subject: [PATCH] Update OcLib --- controllers/workflow_sheduler.go | 14 +++++++------- go.mod | 4 ++-- go.sum | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/controllers/workflow_sheduler.go b/controllers/workflow_sheduler.go index 0b6f875..dfc8164 100644 --- a/controllers/workflow_sheduler.go +++ b/controllers/workflow_sheduler.go @@ -218,12 +218,12 @@ func postCreateServiceAccount(peerID string, s *resources.StorageResource, calle l.Debug().Msg("Lauching execution on" + p.UUID) _, err := p.LaunchPeerExecution(p.UUID, wfId, tools.MINIO_SVCACC, tools.POST, nil, caller) if err != nil { - l.Error().Msg("Error when executing on peer at " + p.Url + " when creating a S3 service account") + l.Error().Msg("Error when executing on peer at " + p.APIUrl + " when creating a S3 service account") l.Error().Msg(err.Error()) return err } if caller.LastResults["code"].(int) != 200 { - l.Error().Msg(fmt.Sprint("Error when trying to create a serviceAccount on storage " + s.Name + " on peer at " + p.Url)) + l.Error().Msg(fmt.Sprint("Error when trying to create a serviceAccount on storage " + s.Name + " on peer at " + p.APIUrl)) if _, ok := caller.LastResults["body"]; ok { l.Error().Msg(string(caller.LastResults["body"].([]byte))) return fmt.Errorf(string(caller.LastResults["body"].(map[string]interface{})["error"].([]byte))) @@ -317,14 +317,14 @@ func getServiceAccountCredentials(peerID string, storageRes resources.StorageRes l.Debug().Msg("Lauching execution on" + p.UUID) resp, err := p.LaunchPeerExecution(p.UUID, wfId, tools.MINIO_SVCACC, tools.POST, body, caller) if err != nil { - l.Error().Msg("Error when executing on peer at " + p.Url + " when retrieving S3 credentials") + l.Error().Msg("Error when executing on peer at " + p.APIUrl + " when retrieving S3 credentials") l.Error().Msg(err.Error()) return "", "", err } result_code := caller.LastResults["code"].(int) if !slices.Contains([]int{200, 201}, result_code) { - l.Error().Msg(fmt.Sprint("Error when trying to create a serviceAccount on storage " + storageRes.Name + " on peer at " + p.Url)) + l.Error().Msg(fmt.Sprint("Error when trying to create a serviceAccount on storage " + storageRes.Name + " on peer at " + p.APIUrl)) if _, ok := caller.LastResults["body"]; ok { l.Error().Msg(string(caller.LastResults["body"].([]byte))) return "", "", fmt.Errorf(string(caller.LastResults["body"].(map[string]interface{})["error"].([]byte))) @@ -364,14 +364,14 @@ func postS3Secret(peerID string, s resources.StorageResource, caller *tools.HTTP _, err := p.LaunchPeerExecution(p.UUID, wfId, tools.MINIO_SVCACC_SECRET, tools.POST, body, caller) if err != nil { - l.Error().Msg("Error when executing on peer at " + p.Url + " when creating a secret holding s3 credentials in namespace " + execId) + l.Error().Msg("Error when executing on peer at " + p.APIUrl + " when creating a secret holding s3 credentials in namespace " + execId) l.Error().Msg(err.Error()) - return fmt.Errorf("Error when executing on peer at " + p.Url + " when creating a secret holding s3 credentials" + " : " + err.Error()) + return fmt.Errorf("Error when executing on peer at " + p.APIUrl + " when creating a secret holding s3 credentials" + " : " + err.Error()) } result_code := caller.LastResults["code"].(int) if !slices.Contains([]int{200, 201}, result_code) { - l.Error().Msg(fmt.Sprint("Error when trying to post the credential to " + s.Name + "to a secret on peer at " + p.Url)) + l.Error().Msg(fmt.Sprint("Error when trying to post the credential to " + s.Name + "to a secret on peer at " + p.APIUrl)) if _, ok := caller.LastResults["body"]; ok { l.Error().Msg(string(caller.LastResults["body"].([]byte))) return fmt.Errorf(string(caller.LastResults["body"].(map[string]interface{})["error"].([]byte))) diff --git a/go.mod b/go.mod index 960f604..800b91f 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,10 @@ go 1.23.0 toolchain go1.24.0 require ( - cloud.o-forge.io/core/oc-lib v0.0.0-20260115122757-1c3b9218f7fb + cloud.o-forge.io/core/oc-lib v0.0.0-20260129122033-186ba3e689c7 github.com/beego/beego/v2 v2.3.8 github.com/google/uuid v1.6.0 + github.com/robfig/cron v1.2.0 github.com/smartystreets/goconvey v1.7.2 go.mongodb.org/mongo-driver v1.17.4 ) @@ -42,7 +43,6 @@ require ( github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.65.0 // indirect github.com/prometheus/procfs v0.17.0 // indirect - github.com/robfig/cron v1.2.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/rs/zerolog v1.34.0 // indirect github.com/shiena/ansicolor v0.0.0-20230509054315-a9deabde6e02 // indirect diff --git a/go.sum b/go.sum index bf3dbff..b8b3123 100644 --- a/go.sum +++ b/go.sum @@ -34,6 +34,8 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20260114125749-fa5b7543332d h1:6oGSN4Fb+H7LN cloud.o-forge.io/core/oc-lib v0.0.0-20260114125749-fa5b7543332d/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI= cloud.o-forge.io/core/oc-lib v0.0.0-20260115122757-1c3b9218f7fb h1:blCzhIrRW1gLTsAVVxFxfhA5LXenxiVNT4kn1MTphLg= cloud.o-forge.io/core/oc-lib v0.0.0-20260115122757-1c3b9218f7fb/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI= +cloud.o-forge.io/core/oc-lib v0.0.0-20260129122033-186ba3e689c7 h1:NRFGRqN+j5g3DrtXMYN5T5XSYICG+OU2DisjBdID3j8= +cloud.o-forge.io/core/oc-lib v0.0.0-20260129122033-186ba3e689c7/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/beego/beego/v2 v2.3.8 h1:wplhB1pF4TxR+2SS4PUej8eDoH4xGfxuHfS7wAk9VBc= github.com/beego/beego/v2 v2.3.8/go.mod h1:8vl9+RrXqvodrl9C8yivX1e6le6deCK6RWeq8R7gTTg=