Code Review
/
nonrtric
/
plt
/
sme.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
NONRTRIC-946: Fix panics in Capif
[nonrtric/plt/sme.git]
/
capifcore
/
main.go
diff --git
a/capifcore/main.go
b/capifcore/main.go
index
3ee4192
..
b0fa1dc
100644
(file)
--- a/
capifcore/main.go
+++ b/
capifcore/main.go
@@
-2,7
+2,8
@@
// ========================LICENSE_START=================================
// O-RAN-SC
// %%
// ========================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.
// %%
// 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/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"
"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"
"oransc.org/nonrtric/capifcore/internal/discoverservice"
"oransc.org/nonrtric/capifcore/internal/eventservice"
"oransc.org/nonrtric/capifcore/internal/helmmanagement"
@@
-87,6
+90,13
@@
func getEcho() *echo.Echo {
// Log all requests
e.Use(echomiddleware.Logger())
// 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()
var group *echo.Group
// Register ProviderManagement
providerManagerSwagger, err := providermanagementapi.GetSwagger()
@@
-128,7
+138,7
@@
func getEcho() *echo.Echo {
log.Fatalf("Error loading InvokerManagement swagger spec\n: %s", err)
}
invokerManagerSwagger.Servers = nil
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")
group = e.Group("/api-invoker-management/v1")
group.Use(middleware.OapiRequestValidator(invokerManagerSwagger))
invokermanagementapi.RegisterHandlersWithBaseURL(e, invokerManager, "/api-invoker-management/v1")
@@
-150,7
+160,7
@@
func getEcho() *echo.Echo {
log.Fatalf("Error loading Security swagger spec\n: %s", err)
}
securitySwagger.Servers = nil
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")
group = e.Group("/capif-security/v1")
group.Use(middleware.OapiRequestValidator(securitySwagger))
securityapi.RegisterHandlersWithBaseURL(e, securityService, "/capif-security/v1")