From 38fbfe594734a435122952b0d2588e3cf44e41bb Mon Sep 17 00:00:00 2001 From: mr Date: Tue, 3 Feb 2026 16:19:00 +0100 Subject: [PATCH] compact oclib --- go.mod | 2 +- go.sum | 2 ++ main.go | 32 +------------------------------- 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/go.mod b/go.mod index 6e27895..ad613ba 100755 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.24 toolchain go1.24.0 require ( - cloud.o-forge.io/core/oc-lib v0.0.0-20260203083753-4f28b9b589d6 + cloud.o-forge.io/core/oc-lib v0.0.0-20260203150531-ef916fe2d995 github.com/beego/beego/v2 v2.3.4 github.com/smartystreets/goconvey v1.7.2 ) diff --git a/go.sum b/go.sum index a8b8e4f..e65de72 100755 --- a/go.sum +++ b/go.sum @@ -8,6 +8,8 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20260203074447-30e6c9a6183c h1:c19lIseiUk5Hp cloud.o-forge.io/core/oc-lib v0.0.0-20260203074447-30e6c9a6183c/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI= cloud.o-forge.io/core/oc-lib v0.0.0-20260203083753-4f28b9b589d6 h1:N+0xkioACl3PNo+MquCIIOL/kSICevg340IYOFGQeOw= cloud.o-forge.io/core/oc-lib v0.0.0-20260203083753-4f28b9b589d6/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI= +cloud.o-forge.io/core/oc-lib v0.0.0-20260203150531-ef916fe2d995 h1:ZDRvnzTTNHgMm5hYmseHdEPqQ6rn/4v+P9f/JIxPaNw= +cloud.o-forge.io/core/oc-lib v0.0.0-20260203150531-ef916fe2d995/go.mod h1:T0UCxRd8w+qCVVC0NEyDiWIGC5ADwEbQ7hFcvftd4Ks= 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/main.go b/main.go index e587ff9..89e0f82 100755 --- a/main.go +++ b/main.go @@ -4,43 +4,13 @@ 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" - "github.com/beego/beego/v2/server/web/filter/cors" ) const appname = "oc-catalog" func main() { // Init the oc-lib - oclib.Init(appname) - - // Load the right config file - o := oclib.GetConfLoader() - - // feed the library with the loaded config - oclib.SetConfig( - o.GetStringDefault("MONGO_URL", "mongodb://127.0.0.1:27017"), - o.GetStringDefault("MONGO_DATABASE", "DC_myDC"), - o.GetStringDefault("NATS_URL", "nats://localhost:4222"), - o.GetStringDefault("LOKI_URL", ""), - o.GetStringDefault("LOG_LEVEL", "info"), - ) - // Beego initialization - beego.BConfig.AppName = appname - beego.BConfig.Listen.HTTPPort = o.GetIntDefault("port", 8080) - beego.BConfig.WebConfig.DirectoryIndex = true - beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger" - api := &tools.API{} - api.Discovered(beego.BeeApp.Handlers.GetAllControllerInfo()) - beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{ - AllowAllOrigins: true, - AllowMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"}, - AllowHeaders: []string{"Origin", "Authorization", "Content-Type"}, - ExposeHeaders: []string{"Content-Length", "Content-Type"}, - AllowCredentials: true, - })) - beego.Run() + oclib.InitAPI(appname) } // TODO VERIFY IF LOOP OF GET VALUE is ENOUGH TO REFRESH