diff --git a/controllers/default.go b/controllers/default.go index afcca0c..e8ebd55 100644 --- a/controllers/default.go +++ b/controllers/default.go @@ -2,6 +2,7 @@ package controllers import ( OCCatalog_cli "oc-search/api-client/oc-catalog" + "oc-search/models" beego "github.com/beego/beego/v2/server/web" ) @@ -13,9 +14,10 @@ type MainController struct { var OCCatalogAPI *OCCatalog_cli.APIClient -func init() { - // auth := context.WithValue(context.Background(), OCCatalog_cli.ContextAPIKey, OCCatalog_cli.APIKey{Key: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdXRob3JpemVkIjp0cnVlLCJleHAiOjE2MTI1OTI3MDIsInVzZXJfaWQiOiJ4ZCJ9.kTLb1FtpdnaobUpe5u9Jw8S7Cc6gf7ExmU4U3XMcC2o"}) - OCCatalogAPI = OCCatalog_cli.NewAPIClient(&OCCatalog_cli.Configuration{BasePath: "http://localhost:49618/v1", +func CreateOCCatalogAPI() { + config := models.GetConfig() + // auth := context.WithValue(context.Background(), OCCatalog_cli.ContextAPIKey, OCCatalog_cli.APIKey{Key: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdXRob3JpemVkIjp0cnVlLCJleHAiOjE2MTI1OTI3MDIsInVzZXJfaWQiOiJ4ZCJ9.kTLb1FtpdnaobUpe5u9Jw8S7Cc6gf7ExmU4U3XMcC2o"}) + OCCatalogAPI = OCCatalog_cli.NewAPIClient(&OCCatalog_cli.Configuration{BasePath: "http://"+config.OcCatalogUrl+"/v1", DefaultHeader: map[string]string{ "authorization": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdXRob3JpemVkIjp0cnVlLCJleHAiOjE2MTMwMDI0NjAsInVzZXJfaWQiOiJhc2QifQ.TXT18aeulnCrtedKKFVaD0BapOTdVAFcJJdVS7zk0I8", }, diff --git a/lastupdate.tmp b/lastupdate.tmp index b0076d0..8e1e210 100755 --- a/lastupdate.tmp +++ b/lastupdate.tmp @@ -1 +1 @@ -{"/home/pierre/oc-search/controllers":1697618043343849928} \ No newline at end of file +{"/home/pierre/open-cloud/oc-search/controllers":1698307784301209722} \ No newline at end of file diff --git a/main.go b/main.go index a003e94..365766d 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,7 @@ package main import ( + "oc-search/controllers" "oc-search/models" _ "oc-search/routers" _ "oc-search/views" @@ -14,6 +15,21 @@ const defaultConfigFile = "/etc/oc/search.json" const localConfigFile = "./search.json" func main() { + + loadConfig() + controllers.CreateOCCatalogAPI() + + beego.BConfig.WebConfig.Session.SessionOn = true + beego.SetStaticPath("/favicon.ico", "/static/favicon.ico") + beego.BConfig.WebConfig.DirectoryIndex = true + beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger" + + beego.Run() +} + +// Initialising the config in the init so that the oc-catalog API receives it + +func loadConfig(){ log := logs.NewLogger(10000) log.SetLogger("console") @@ -42,10 +58,5 @@ func main() { } models.GetConfig().OcCatalogUrl = o.GetStringDefault("oc-catalog", "localhost:49618") - beego.BConfig.WebConfig.Session.SessionOn = true - beego.SetStaticPath("/favicon.ico", "/static/favicon.ico") - beego.BConfig.WebConfig.DirectoryIndex = true - beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger" - - beego.Run() + logs.Info("Value for oc-catalog url : " + models.GetConfig().OcCatalogUrl) } diff --git a/oc-search b/oc-search index 3df8f89..f1e41f3 100755 Binary files a/oc-search and b/oc-search differ