From 1a4dbb172bfc20e345c573b9970cb6d7c62ef45a Mon Sep 17 00:00:00 2001 From: mr Date: Tue, 3 Feb 2026 16:18:18 +0100 Subject: [PATCH] compact conf --- go.mod | 2 +- go.sum | 2 ++ main.go | 39 ++++----------------------------------- 3 files changed, 7 insertions(+), 36 deletions(-) diff --git a/go.mod b/go.mod index 0dd95a7..206ea6e 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.24.2 toolchain go1.24.4 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.8 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/gorilla/websocket v1.5.3 diff --git a/go.sum b/go.sum index 6ae6f0c..bef9025 100644 --- a/go.sum +++ b/go.sum @@ -6,6 +6,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.8 h1:wplhB1pF4TxR+2SS4PUej8eDoH4xGfxuHfS7wAk9VBc= github.com/beego/beego/v2 v2.3.8/go.mod h1:8vl9+RrXqvodrl9C8yivX1e6le6deCK6RWeq8R7gTTg= diff --git a/main.go b/main.go index c759ae9..0b7db7f 100644 --- a/main.go +++ b/main.go @@ -7,23 +7,17 @@ import ( "os" 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-datacenter" func main() { - // Init the oc-lib - oclib.Init(appname) - // Load the right config file o := oclib.GetConfLoader() conf.GetConfig().Mode = o.GetStringDefault("MODE", "kubernetes") conf.GetConfig().KubeHost = o.GetStringDefault("KUBERNETES_SERVICE_HOST", os.Getenv("KUBERNETES_SERVICE_HOST")) conf.GetConfig().KubePort = o.GetStringDefault("KUBERNETES_SERVICE_PORT", "6443") - + sDec, err := base64.StdEncoding.DecodeString(o.GetStringDefault("KUBE_CA", "")) if err == nil { conf.GetConfig().KubeCA = string(sDec) @@ -37,32 +31,7 @@ func main() { conf.GetConfig().KubeData = string(sDec) } - conf.GetConfig().MinioRootKey = o.GetStringDefault("MINIO_ADMIN_ACCESS","") - conf.GetConfig().MinioRootSecret = o.GetStringDefault("MINIO_ADMIN_SECRET","") - - - // 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 init - 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() + conf.GetConfig().MinioRootKey = o.GetStringDefault("MINIO_ADMIN_ACCESS", "") + conf.GetConfig().MinioRootSecret = o.GetStringDefault("MINIO_ADMIN_SECRET", "") + oclib.InitAPI(appname) }