NONRTRIC-946: Servicemanager - mock kong and capif as library

[nonrtric/plt/sme.git] / capifcore / internal / invokermanagement / invokermanagement.go

diff --git a/capifcore/internal/invokermanagement/invokermanagement.go b/capifcore/internal/invokermanagement/invokermanagement.go
index f0a4155..0dea817 100644 (file)
--- a/capifcore/internal/invokermanagement/invokermanagement.go
+++ b/capifcore/internal/invokermanagement/invokermanagement.go
@@ -2,7 +2,8 @@
 //   ========================LICENSE_START=================================
 //   O-RAN-SC
 //   %%
-//   Copyright (C) 2022: Nordix Foundation
+//   Copyright (C) 2022-2023: Nordix Foundation
+//   Copyright (C) 2024: OpenInfra Foundation Europe
 //   %%
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -113,7 +114,7 @@ func (im *InvokerManager) PostOnboardedInvokers(ctx echo.Context) error {
                return sendCoreError(ctx, http.StatusForbidden, fmt.Sprintf(errMsg, err))
        }
 
-       if err = im.validateInvoker(newInvoker, ctx); err != nil {
+       if err = im.validateInvoker(newInvoker); err != nil {
                return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
        }
 
@@ -143,15 +144,25 @@ func (im *InvokerManager) isInvokerOnboarded(newInvoker invokerapi.APIInvokerEnr
 }
 
 func (im *InvokerManager) prepareNewInvoker(newInvoker *invokerapi.APIInvokerEnrolmentDetails) {
-       var apiList invokerapi.APIList = im.publishRegister.GetAllPublishedServices()
-       newInvoker.ApiList = &apiList
+       var apiListRequestedServices invokerapi.APIList = nil
+       if newInvoker.ApiList != nil {
+               apiListRequestedServices = *newInvoker.ApiList
+       }
+       var allowedPublishedServices invokerapi.APIList = im.publishRegister.GetAllowedPublishedServices(apiListRequestedServices)
+       newInvoker.ApiList = &allowedPublishedServices
 
        im.lock.Lock()
        defer im.lock.Unlock()
 
        newInvoker.PrepareNewInvoker()
 
-       im.addClientInKeycloak(newInvoker)
+       if im.keycloak != nil {
+               // The type assertion fails when unit testing from ServiceManager where we use Capif as a library, and we are not using Keycloak.
+               if _, ok := im.keycloak.(*keycloak.KeycloakManager); !ok {
+                       // im.keycloak is not nil and its dynamic value is not nil.
+                       im.addClientInKeycloak(newInvoker)
+        }
+       }
 
        im.onboardedInvokers[*newInvoker.ApiInvokerId] = *newInvoker
 }
@@ -209,7 +220,7 @@ func (im *InvokerManager) PutOnboardedInvokersOnboardingId(ctx echo.Context, onb
                return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, errMismatch))
        }
 
-       if err := im.validateInvoker(newInvoker, ctx); err != nil {
+       if err := im.validateInvoker(newInvoker); err != nil {
                return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
        }
 
@@ -238,7 +249,7 @@ func (im *InvokerManager) ModifyIndApiInvokeEnrolment(ctx echo.Context, onboardi
        return ctx.NoContent(http.StatusNotImplemented)
 }
 
-func (im *InvokerManager) validateInvoker(invoker invokerapi.APIInvokerEnrolmentDetails, ctx echo.Context) error {
+func (im *InvokerManager) validateInvoker(invoker invokerapi.APIInvokerEnrolmentDetails) error {
        if err := invoker.Validate(); err != nil {
                return err
        }