IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-16791] Migrate Plugin.Delete to Sync by default (#11580)

Browse Source 
* Migrate Plugin.Delete to Sync by default

* remove unused import
This commit is contained in:
Phillip Ahereza
2019-07-16 16:10:17 +03:00
committed by Martin Kraft
parent 5015550f23
commit 1cb32b2331
5 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
store/sqlstore/plugin_store.go
View File

@@ -124,14 +124,11 @@ func (ps SqlPluginStore) Get(pluginId, key string) (*model.PluginKeyValue, *mode
return kv, nil
}
func (ps SqlPluginStore) Delete(pluginId, key string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
if _, err := ps.GetMaster().Exec("DELETE FROM PluginKeyValueStore WHERE PluginId = :PluginId AND PKey = :Key", map[string]interface{}{"PluginId": pluginId, "Key": key}); err != nil {
result.Err = model.NewAppError("SqlPluginStore.Delete", "store.sql_plugin_store.delete.app_error", nil, fmt.Sprintf("plugin_id=%v, key=%v, err=%v", pluginId, key, err.Error()), http.StatusInternalServerError)
} else {
result.Data = true
}
})
func (ps SqlPluginStore) Delete(pluginId, key string) *model.AppError {
if _, err := ps.GetMaster().Exec("DELETE FROM PluginKeyValueStore WHERE PluginId = :PluginId AND PKey = :Key", map[string]interface{}{"PluginId": pluginId, "Key": key}); err != nil {
return model.NewAppError("SqlPluginStore.Delete", "store.sql_plugin_store.delete.app_error", nil, fmt.Sprintf("plugin_id=%v, key=%v, err=%v", pluginId, key, err.Error()), http.StatusInternalServerError)
}
return nil
}
func (ps SqlPluginStore) DeleteAllForPlugin(pluginId string) *model.AppError {

2
store/store.go
View File

@@ -538,7 +538,7 @@ type PluginStore interface {
SaveOrUpdate(keyVal *model.PluginKeyValue) (*model.PluginKeyValue, *model.AppError)
CompareAndSet(keyVal *model.PluginKeyValue, oldValue []byte) (bool, *model.AppError)
Get(pluginId, key string) (*model.PluginKeyValue, *model.AppError)
Delete(pluginId, key string) StoreChannel
Delete(pluginId, key string) *model.AppError
DeleteAllForPlugin(PluginId string) *model.AppError
DeleteAllExpired() *model.AppError
List(pluginId string, page, perPage int) ([]string, *model.AppError)

9
store/storetest/mocks/PluginStore.go
View File

@@ -6,7 +6,6 @@ package mocks
import mock "github.com/stretchr/testify/mock"
import model "github.com/mattermost/mattermost-server/model"
import store "github.com/mattermost/mattermost-server/store"
// PluginStore is an autogenerated mock type for the PluginStore type
type PluginStore struct {
@@ -37,15 +36,15 @@ func (_m *PluginStore) CompareAndSet(keyVal *model.PluginKeyValue, oldValue []by
}
// Delete provides a mock function with given fields: pluginId, key
func (_m *PluginStore) Delete(pluginId string, key string) store.StoreChannel {
func (_m *PluginStore) Delete(pluginId string, key string) *model.AppError {
ret := _m.Called(pluginId, key)
var r0 store.StoreChannel
if rf, ok := ret.Get(0).(func(string, string) store.StoreChannel); ok {
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string, string) *model.AppError); ok {
r0 = rf(pluginId, key)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel)
r0 = ret.Get(0).(*model.AppError)
}
}

10
store/storetest/plugin_store.go
View File

@@ -34,7 +34,7 @@ func testPluginSaveGet(t *testing.T, ss store.Store) {
}
defer func() {
<-ss.Plugin().Delete(kv.PluginId, kv.Key)
_ = ss.Plugin().Delete(kv.PluginId, kv.Key)
}()
if received, err := ss.Plugin().Get(kv.PluginId, kv.Key); err != nil {
@@ -74,7 +74,7 @@ func testPluginSaveGetExpiry(t *testing.T, ss store.Store) {
}
defer func() {
<-ss.Plugin().Delete(kv.PluginId, kv.Key)
_ = ss.Plugin().Delete(kv.PluginId, kv.Key)
}()
if received, err := ss.Plugin().Get(kv.PluginId, kv.Key); err != nil {
@@ -98,7 +98,7 @@ func testPluginSaveGetExpiry(t *testing.T, ss store.Store) {
}
defer func() {
<-ss.Plugin().Delete(kv.PluginId, kv.Key)
_ = ss.Plugin().Delete(kv.PluginId, kv.Key)
}()
if _, err := ss.Plugin().Get(kv.PluginId, kv.Key); err == nil {
@@ -114,8 +114,8 @@ func testPluginDelete(t *testing.T, ss store.Store) {
})
require.Nil(t, err)
if result := <-ss.Plugin().Delete(kv.PluginId, kv.Key); result.Err != nil {
t.Fatal(result.Err)
if err := ss.Plugin().Delete(kv.PluginId, kv.Key); err != nil {
t.Fatal(err)
}
}