From 8b38c20df228a23222dcb8c99259686dcf910f44 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.b.seidl@stud.h-da.de>
Date: Fri, 6 May 2022 14:02:14 +0000
Subject: [PATCH] Hotfix update issue with memory store
See merge request danet/gosdn!304
---
controller/northbound/server/auth_test.go | 1 +
controller/nucleus/memoryDeviceStore.go | 4 ++--
controller/rbac/memoryRoleStore.go | 4 ++--
controller/rbac/memoryUserStore.go | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/controller/northbound/server/auth_test.go b/controller/northbound/server/auth_test.go
index ba6487644..8681ca7cb 100644
--- a/controller/northbound/server/auth_test.go
+++ b/controller/northbound/server/auth_test.go
@@ -620,6 +620,7 @@ func TestAuth_UpdateRoles(t *testing.T) {
}
func TestAuth_DeletePermissionsForRole(t *testing.T) {
+ clearAndCreateAuthTestSetup()
type args struct {
ctx context.Context
request *apb.DeletePermissionsForRoleRequest
diff --git a/controller/nucleus/memoryDeviceStore.go b/controller/nucleus/memoryDeviceStore.go
index 536bb6ea4..9a04d7a5c 100644
--- a/controller/nucleus/memoryDeviceStore.go
+++ b/controller/nucleus/memoryDeviceStore.go
@@ -49,8 +49,8 @@ func (t *MemoryDeviceStore) Add(item device.Device) error {
// Update updates a existing device.
func (t *MemoryDeviceStore) Update(item device.Device) error {
_, ok := t.Store[item.ID().String()]
- if ok {
- return nil
+ if !ok {
+ return errors.ErrCouldNotFind{StoreName: deviceStoreName}
}
var device device.LoadedDevice
diff --git a/controller/rbac/memoryRoleStore.go b/controller/rbac/memoryRoleStore.go
index e40dc60b7..da0e023eb 100644
--- a/controller/rbac/memoryRoleStore.go
+++ b/controller/rbac/memoryRoleStore.go
@@ -55,8 +55,8 @@ func (s *MemoryRoleStore) Delete(item rbac.Role) error {
// Update updates an existing role.
func (s *MemoryRoleStore) Update(item rbac.Role) error {
_, ok := s.Store[item.ID().String()]
- if ok {
- return nil
+ if !ok {
+ return errors.ErrCouldNotFind{StoreName: roleStoreName}
}
var role rbac.LoadedRole
diff --git a/controller/rbac/memoryUserStore.go b/controller/rbac/memoryUserStore.go
index 338f56180..c97439278 100644
--- a/controller/rbac/memoryUserStore.go
+++ b/controller/rbac/memoryUserStore.go
@@ -55,8 +55,8 @@ func (s *MemoryUserStore) Delete(item rbac.User) error {
// Update updates an existing user.
func (s *MemoryUserStore) Update(item rbac.User) error {
_, ok := s.Store[item.ID().String()]
- if ok {
- return nil
+ if !ok {
+ return errors.ErrCouldNotFind{StoreName: userStoreName}
}
var user rbac.LoadedUser
--
GitLab