X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Fmain.go;h=93c062667d2c4411545dcdbfab747ec1baf8351b;hb=56ec953f91355ba51e64c020e2bab710b44765af;hp=3ee41929f431b4efc2ecb18adc86f0a4ef115ea1;hpb=9e3c79c9e9f3468174a91deb6848e5e386608baf;p=nonrtric%2Fplt%2Fsme.git diff --git a/capifcore/main.go b/capifcore/main.go index 3ee4192..93c0626 100644 --- a/capifcore/main.go +++ b/capifcore/main.go @@ -32,12 +32,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" @@ -87,6 +89,13 @@ func getEcho() *echo.Echo { // 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() @@ -128,7 +137,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") @@ -150,7 +159,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")