NONRTRIC-946: Create Service with R1-SME APIs (Service Manager - SME)

[nonrtric/plt/sme.git] / capifcore / main.go

diff --git a/capifcore/main.go b/capifcore/main.go
index 1c1890f..93c0626 100644 (file)
--- 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"
@@ -83,11 +85,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 +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")
@@ -151,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")