From 680de0c7d0bd2aa780cfe3e3ba5543f7d14495a2 Mon Sep 17 00:00:00 2001 From: tbuchaillot Date: Fri, 30 Dec 2022 22:50:47 +0100 Subject: [PATCH] fixing tests linting --- gateway/rpc_storage_handler_test.go | 4 ++-- rpc/synchronization_forcer.go | 4 +++- rpc/synchronization_forcer_test.go | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gateway/rpc_storage_handler_test.go b/gateway/rpc_storage_handler_test.go index 7ae5a1d3a3d..ae2e0c3eb4d 100644 --- a/gateway/rpc_storage_handler_test.go +++ b/gateway/rpc_storage_handler_test.go @@ -322,8 +322,8 @@ func TestGetGroupLoginCallback(t *testing.T) { } fn := rpcListener.getGroupLoginCallback(tc.syncEnabled) - groupLogin := fn(tc.givenKey, tc.givenGroup).(apidef.GroupLoginRequest) - + groupLogin, ok := fn(tc.givenKey, tc.givenGroup).(apidef.GroupLoginRequest) + assert.True(t, ok) assert.Equal(t, tc.expectedCallbackResponse, groupLogin) }) } diff --git a/rpc/synchronization_forcer.go b/rpc/synchronization_forcer.go index ef46f37c66c..c140a6a8595 100644 --- a/rpc/synchronization_forcer.go +++ b/rpc/synchronization_forcer.go @@ -1,6 +1,8 @@ package rpc import ( + "errors" + "github.com/TykTechnologies/tyk/apidef" "github.com/TykTechnologies/tyk/storage" ) @@ -22,7 +24,7 @@ func (sf *SyncronizerForcer) GrouLoginCallback(userKey string, groupID string) i shouldForce := false _, err := sf.store.GetKey(groupID) - if err != nil && err == storage.ErrKeyNotFound { + if err != nil && errors.Is(err, storage.ErrKeyNotFound) { shouldForce = true err = sf.store.SetKey(groupID, "", 0) diff --git a/rpc/synchronization_forcer_test.go b/rpc/synchronization_forcer_test.go index 8c4f31697a6..df74b619c25 100644 --- a/rpc/synchronization_forcer_test.go +++ b/rpc/synchronization_forcer_test.go @@ -45,13 +45,15 @@ func TestGrouLoginCallback(t *testing.T) { groupID := "group" //first time, it should force since the group key doesn't exists - groupLogin := sf.GrouLoginCallback(key, groupID).(apidef.GroupLoginRequest) + groupLogin, ok := sf.GrouLoginCallback(key, groupID).(apidef.GroupLoginRequest) + assert.True(t, ok) assert.Equal(t, true, groupLogin.ForceSync) assert.Equal(t, key, groupLogin.UserKey) assert.Equal(t, groupID, groupLogin.GroupID) //second time, it shouldn't force since the group key already exists - groupLogin = sf.GrouLoginCallback(key, groupID).(apidef.GroupLoginRequest) + groupLogin, ok = sf.GrouLoginCallback(key, groupID).(apidef.GroupLoginRequest) + assert.True(t, ok) assert.Equal(t, false, groupLogin.ForceSync) assert.Equal(t, key, groupLogin.UserKey) assert.Equal(t, groupID, groupLogin.GroupID)