Migrate Plugin.SaveOrUpdate to sync by default (#11592)

app/plugin_key_value_store.go

@@ -34,9 +34,9 @@ func (a *App) SetPluginKeyWithExpiry(pluginId string, key string, value []byte,
 		ExpireAt: expireInSeconds,
 	}
 
-	if result := <-a.Srv.Store.Plugin().SaveOrUpdate(kv); result.Err != nil {
-		mlog.Error("Failed to set plugin key value", mlog.String("plugin_id", pluginId), mlog.String("key", key), mlog.Err(result.Err))
-		return result.Err
+	if _, err := a.Srv.Store.Plugin().SaveOrUpdate(kv); err != nil {
+		mlog.Error("Failed to set plugin key value", mlog.String("plugin_id", pluginId), mlog.String("key", key), mlog.Err(err))
+		return err
 	}
 
 	// Clean up a previous entry using the hashed key, if it exists.

app/plugin_test.go

@@ -66,8 +66,8 @@ func TestPluginKeyValueStore(t *testing.T) {
 		ExpireAt: 0,
 	}
 
-	result := <-th.App.Srv.Store.Plugin().SaveOrUpdate(kv)
-	assert.Nil(t, result.Err)
+	_, err = th.App.Srv.Store.Plugin().SaveOrUpdate(kv)
+	assert.Nil(t, err)
 
 	// Test fetch by keyname (this key does not exist but hashed key will be used for lookup)
 	ret, err = th.App.GetPluginKey(pluginId, "key2")