X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Fmain.go;h=b0fa1dc2f010772ef34f605af02b9b64208e430e;hb=55e8dfc4ed1ffa5877ee8517a05a3b36d34d4882;hp=1c1890f2391fb5c4024f44b624d89764657e7861;hpb=b309fbd569151ca79a6dd20d27cdd02319145499;p=nonrtric%2Fplt%2Fsme.git

diff --git a/capifcore/main.go b/capifcore/main.go
index 1c1890f..b0fa1dc 100644
--- a/capifcore/main.go
+++ b/capifcore/main.go
@@ -2,7 +2,8 @@
 //   ========================LICENSE_START=================================
 //   O-RAN-SC
 //   %%
-//   Copyright (C) 2022: Nordix Foundation
+//   Copyright (C) 2022: Nordix Foundation. All rights reserved.
+//   Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
 //   %%
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -32,12 +33,14 @@ import (
 	"oransc.org/nonrtric/capifcore/internal/discoverserviceapi"
 	"oransc.org/nonrtric/capifcore/internal/eventsapi"
 	"oransc.org/nonrtric/capifcore/internal/invokermanagementapi"
+	"oransc.org/nonrtric/capifcore/internal/keycloak"
 	"oransc.org/nonrtric/capifcore/internal/providermanagementapi"
 	"oransc.org/nonrtric/capifcore/internal/securityapi"
 
 	"github.com/deepmap/oapi-codegen/pkg/middleware"
 	echomiddleware "github.com/labstack/echo/v4/middleware"
 	log "github.com/sirupsen/logrus"
+	config "oransc.org/nonrtric/capifcore/internal/config"
 	"oransc.org/nonrtric/capifcore/internal/discoverservice"
 	"oransc.org/nonrtric/capifcore/internal/eventservice"
 	"oransc.org/nonrtric/capifcore/internal/helmmanagement"
@@ -83,11 +86,17 @@ func main() {
 }
 
 func getEcho() *echo.Echo {
-	// This is how you set up a basic Echo router
 	e := echo.New()
 	// Log all requests
 	e.Use(echomiddleware.Logger())
 
+	// Read configuration file
+	cfg, err := config.ReadKeycloakConfigFile("configs")
+	if err != nil {
+		log.Fatalf("Error loading configuration file\n: %s", err)
+	}
+	km := keycloak.NewKeycloakManager(cfg, &http.Client{})
+
 	var group *echo.Group
 	// Register ProviderManagement
 	providerManagerSwagger, err := providermanagementapi.GetSwagger()
@@ -129,7 +138,7 @@ func getEcho() *echo.Echo {
 		log.Fatalf("Error loading InvokerManagement swagger spec\n: %s", err)
 	}
 	invokerManagerSwagger.Servers = nil
-	invokerManager := invokermanagement.NewInvokerManager(publishService, eventChannel)
+	invokerManager := invokermanagement.NewInvokerManager(publishService, km, eventChannel)
 	group = e.Group("/api-invoker-management/v1")
 	group.Use(middleware.OapiRequestValidator(invokerManagerSwagger))
 	invokermanagementapi.RegisterHandlersWithBaseURL(e, invokerManager, "/api-invoker-management/v1")
@@ -151,7 +160,7 @@ func getEcho() *echo.Echo {
 		log.Fatalf("Error loading Security swagger spec\n: %s", err)
 	}
 	securitySwagger.Servers = nil
-	securityService := security.NewSecurity(providerManager, publishService, invokerManager)
+	securityService := security.NewSecurity(providerManager, publishService, invokerManager, km)
 	group = e.Group("/capif-security/v1")
 	group.Use(middleware.OapiRequestValidator(securitySwagger))
 	securityapi.RegisterHandlersWithBaseURL(e, securityService, "/capif-security/v1")