From afba10d294fa8c82c2f7afa0bb563c2da1da3dda Mon Sep 17 00:00:00 2001 From: mr Date: Wed, 18 Feb 2026 14:38:50 +0100 Subject: [PATCH] Update OCLIB --- go.mod | 2 +- go.sum | 4 ++++ infrastructure/nats.go | 46 ------------------------------------------ main.go | 3 +++ 4 files changed, 8 insertions(+), 47 deletions(-) diff --git a/go.mod b/go.mod index 5a826d7..2432968 100755 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module oc-catalog go 1.24.6 require ( - cloud.o-forge.io/core/oc-lib v0.0.0-20260209113703-b9c9b6678099 + cloud.o-forge.io/core/oc-lib v0.0.0-20260218132556-0b41e2505e2f github.com/beego/beego/v2 v2.3.4 github.com/smartystreets/goconvey v1.7.2 ) diff --git a/go.sum b/go.sum index 7ad3f0d..4317cf3 100755 --- a/go.sum +++ b/go.sum @@ -14,6 +14,10 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20260205143023-b9e7ce20b6d9 h1:NoeL4aA2/z2ME cloud.o-forge.io/core/oc-lib v0.0.0-20260205143023-b9e7ce20b6d9/go.mod h1:T0UCxRd8w+qCVVC0NEyDiWIGC5ADwEbQ7hFcvftd4Ks= cloud.o-forge.io/core/oc-lib v0.0.0-20260209113703-b9c9b6678099 h1:HczicbRtjiU51McjpDkmCsrQVs406bHybbLd+ZkqTo0= cloud.o-forge.io/core/oc-lib v0.0.0-20260209113703-b9c9b6678099/go.mod h1:jmyBwmsac/4V7XPL347qawF60JsBCDmNAMfn/ySXKYo= +cloud.o-forge.io/core/oc-lib v0.0.0-20260212123952-403913d8cf13 h1:DNIPQ7C+7wjbj5RUx29wLxuIe/wiSOcuUMlLRIv6Fvs= +cloud.o-forge.io/core/oc-lib v0.0.0-20260212123952-403913d8cf13/go.mod h1:jmyBwmsac/4V7XPL347qawF60JsBCDmNAMfn/ySXKYo= +cloud.o-forge.io/core/oc-lib v0.0.0-20260218132556-0b41e2505e2f h1:OFuJhi23D/UNwn8Jo30HDt/Sm2Ea1ljUk6IVicYSuAQ= +cloud.o-forge.io/core/oc-lib v0.0.0-20260218132556-0b41e2505e2f/go.mod h1:jmyBwmsac/4V7XPL347qawF60JsBCDmNAMfn/ySXKYo= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/beego/beego/v2 v2.3.4 h1:HurQEOGIEhLlPFCTR6ZDuQkybrUl2Ag2i6CdVD2rGiI= github.com/beego/beego/v2 v2.3.4/go.mod h1:5cqHsOHJIxkq44tBpRvtDe59GuVRVv/9/tyVDxd5ce4= diff --git a/infrastructure/nats.go b/infrastructure/nats.go index 2e63eeb..64ae161 100644 --- a/infrastructure/nats.go +++ b/infrastructure/nats.go @@ -2,11 +2,8 @@ package infrastructure import ( "encoding/json" - "fmt" oclib "cloud.o-forge.io/core/oc-lib" - "cloud.o-forge.io/core/oc-lib/config" - "cloud.o-forge.io/core/oc-lib/models/peer" "cloud.o-forge.io/core/oc-lib/models/resources" "cloud.o-forge.io/core/oc-lib/tools" ) @@ -60,48 +57,5 @@ func ListenNATS() { SearchStream[resp.User] <- p // TODO when do we update it in our catalog ? } }, - tools.CREATE_PEER: func(resp tools.NATSResponse) { - if resp.FromApp == config.GetAppName() { - return - } - var p peer.Peer - err := json.Unmarshal(resp.Payload, &p) - if err == nil && p.Relation == peer.BLACKLIST { - for _, col := range ressourceCols { - access := oclib.NewRequestAdmin(col, nil) - datas := access.Search(nil, p.UUID, false) - for _, data := range datas.Data { - access.DeleteOne(data.GetID()) - } - } - } - }, - tools.CREATE_RESOURCE: func(resp tools.NATSResponse) { - if resp.FromApp == config.GetAppName() { - return - } - p := map[string]interface{}{} - err := json.Unmarshal(resp.Payload, &p) - if err == nil { - access := oclib.NewRequestAdmin(oclib.LibDataEnum(resp.Datatype), nil) - if data := access.LoadOne(fmt.Sprintf("%v", p["id"])); data.Data != nil { - delete(p, "id") - access.UpdateOne(p, fmt.Sprintf("%v", p["id"])) - } else { - access.StoreOne(p) - } - } - }, - tools.REMOVE_RESOURCE: func(resp tools.NATSResponse) { - if resp.FromApp == config.GetAppName() { - return - } - p := map[string]interface{}{} - access := oclib.NewRequestAdmin(oclib.LibDataEnum(resp.Datatype), nil) - err := json.Unmarshal(resp.Payload, &p) - if err == nil { - access.DeleteOne(fmt.Sprintf("%v", p["id"])) - } - }, }) } diff --git a/main.go b/main.go index 02f1780..af5fde6 100755 --- a/main.go +++ b/main.go @@ -5,6 +5,7 @@ import ( _ "oc-catalog/routers" oclib "cloud.o-forge.io/core/oc-lib" + "cloud.o-forge.io/core/oc-lib/tools" beego "github.com/beego/beego/v2/server/web" ) @@ -13,6 +14,8 @@ const appname = "oc-catalog" func main() { // Init the oc-lib oclib.InitAPI(appname) + go oclib.InitNATSDecentralizedEmitter(tools.COMPUTE_RESOURCE, tools.DATA_RESOURCE, + tools.PROCESSING_RESOURCE, tools.STORAGE_RESOURCE, tools.WORKFLOW_RESOURCE) go infrastructure.ListenNATS() beego.Run() }