* Posts * Add missing translation * Fix internal store marshaling * [MM-22051] Remove To/From JSON (Channels) (#18116) * Channels * Channel members * ChannelSearch * Channel categories, list, sidebar, stats, view * Fix conversions * [MM-22051] Remove To/From JSON (Users) (#18121) * User related structs * Fix return * Team related structures (#18127) * [MM-22051] Remove To/From JSON (Status, Bot, Reaction, Thread, FileInfo) (#18130) * Status * Bot * Reaction * Thread * FileInfo * Some fixes * Translations update from Weblate (#18143) * Translated using Weblate (German) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/hu/ * Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ * Translated using Weblate (German) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/hu/ * Translated using Weblate (English (Australia)) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/en_AU/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ * Translated using Weblate (Japanese) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ja/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/zh_Hans/ Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> * [MM-22051] Remove To/From JSON methods from model (#18138) * Scheme * Role * Session * Config * Status * Fix logic * Emoji * GuestsInvite * Group * Command * ClusterInfo * License * Job * System * Plugin * Command2 * IncomingWebhook * OutgoingWebhook * Fix tests * Update traslation * Some fixes * Add missing return * Simplify * Make Config.ToJSONFiltered() return []byte * Make Busy.ToJSON() return []byte * Include error in log * Split logic * [MM-22051] Remove To/From JSON (final) (#18150) * SwitchRequest * PluginEventData * Permalink * PushNotification * SuggestCommand * PluginsResponse * WebSocketMessage * RemoteCluster * SharedChannel * PluginStatuses * InitialLoad * ClusterDiscovery * ClusterStats * MfaSecret * GroupSyncable * SAML * WebSocketRequest * TypingRequest * SecurityBulletin * OAuthApp * IntegrationAction * DataRetention * Preference * FileInfoList * Compliance * Preferences * FileInfoSearchResults * TermsOfService * InstallMarketplacePluginRequest * GitLabUser * UploadSessions * Remove unused helpers * Fix tests * [MM-23280] Fix linting for ToJSON/FromJSON (#18153) * SwitchRequest * PluginEventData * Permalink * PushNotification * SuggestCommand * PluginsResponse * WebSocketMessage * RemoteCluster * SharedChannel * PluginStatuses * InitialLoad * ClusterDiscovery * ClusterStats * MfaSecret * GroupSyncable * SAML * WebSocketRequest * TypingRequest * SecurityBulletin * OAuthApp * IntegrationAction * DataRetention * Preference * FileInfoList * Compliance * Preferences * FileInfoSearchResults * TermsOfService * InstallMarketplacePluginRequest * GitLabUser * UploadSessions * Remove unused helpers * Fix tests * Fix linting for ToJSON/FromJSON * Fix conversions Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
206 строки
5.1 KiB
Go
206 строки
5.1 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package remotecluster
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"sync"
|
|
"sync/atomic"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"github.com/wiggin77/merror"
|
|
|
|
"github.com/mattermost/mattermost-server/v6/model"
|
|
)
|
|
|
|
const (
|
|
TestTopics = " share incident "
|
|
TestTopic = "share"
|
|
NumRemotes = 50
|
|
NoteContent = "Woot!!"
|
|
)
|
|
|
|
type testPayload struct {
|
|
Note string `json:"note"`
|
|
}
|
|
|
|
func TestBroadcastMsg(t *testing.T) {
|
|
msgId := model.NewId()
|
|
disablePing = true
|
|
|
|
t.Run("No error", func(t *testing.T) {
|
|
var countCallbacks int32
|
|
var countWebReq int32
|
|
merr := merror.New()
|
|
|
|
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
defer func() {
|
|
w.WriteHeader(200)
|
|
var resp Response
|
|
b, errMarshall := json.Marshal(&resp)
|
|
if errMarshall != nil {
|
|
merr.Append(errMarshall)
|
|
return
|
|
}
|
|
w.Write(b)
|
|
}()
|
|
|
|
atomic.AddInt32(&countWebReq, 1)
|
|
|
|
var frame model.RemoteClusterFrame
|
|
jsonErr := json.NewDecoder(r.Body).Decode(&frame)
|
|
if jsonErr != nil {
|
|
merr.Append(jsonErr)
|
|
return
|
|
}
|
|
if len(frame.Msg.Payload) == 0 {
|
|
merr.Append(fmt.Errorf("webrequest missing Msg.Payload"))
|
|
}
|
|
if msgId != frame.Msg.Id {
|
|
merr.Append(fmt.Errorf("webrequest msgId expected %s, got %s", msgId, frame.Msg.Id))
|
|
return
|
|
}
|
|
|
|
note := testPayload{}
|
|
err := json.Unmarshal(frame.Msg.Payload, ¬e)
|
|
if err != nil {
|
|
merr.Append(err)
|
|
return
|
|
}
|
|
if note.Note != NoteContent {
|
|
merr.Append(fmt.Errorf("webrequest payload expected %s, got %s", NoteContent, note.Note))
|
|
return
|
|
}
|
|
}))
|
|
defer ts.Close()
|
|
|
|
mockServer := newMockServer(makeRemoteClusters(NumRemotes, ts.URL))
|
|
defer mockServer.Shutdown()
|
|
|
|
service, err := NewRemoteClusterService(mockServer)
|
|
require.NoError(t, err)
|
|
|
|
err = service.Start()
|
|
require.NoError(t, err)
|
|
defer service.Shutdown()
|
|
|
|
wg := &sync.WaitGroup{}
|
|
wg.Add(NumRemotes)
|
|
|
|
msg := makeRemoteClusterMsg(msgId, NoteContent)
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), time.Second*15)
|
|
defer cancel()
|
|
|
|
err = service.BroadcastMsg(ctx, msg, func(msg model.RemoteClusterMsg, remote *model.RemoteCluster, resp *Response, err error) {
|
|
defer wg.Done()
|
|
atomic.AddInt32(&countCallbacks, 1)
|
|
|
|
if err != nil {
|
|
merr.Append(err)
|
|
}
|
|
if msgId != msg.Id {
|
|
merr.Append(fmt.Errorf("result callback msgId expected %s, got %s", msgId, msg.Id))
|
|
}
|
|
|
|
var note testPayload
|
|
err2 := json.Unmarshal(msg.Payload, ¬e)
|
|
if err2 != nil {
|
|
merr.Append(fmt.Errorf("unmarshal payload error: %w", err2))
|
|
return
|
|
}
|
|
if note.Note != NoteContent {
|
|
merr.Append(fmt.Errorf("compare payload failed: expected '%s', got '%s'", NoteContent, note))
|
|
}
|
|
})
|
|
assert.NoError(t, err)
|
|
|
|
wg.Wait()
|
|
|
|
assert.NoError(t, merr.ErrorOrNil())
|
|
|
|
assert.Equal(t, int32(NumRemotes), atomic.LoadInt32(&countCallbacks))
|
|
assert.Equal(t, int32(NumRemotes), atomic.LoadInt32(&countWebReq))
|
|
t.Log(fmt.Sprintf("%d callbacks counted; %d web requests counted; %d expected",
|
|
atomic.LoadInt32(&countCallbacks), atomic.LoadInt32(&countWebReq), NumRemotes))
|
|
})
|
|
|
|
t.Run("HTTP error", func(t *testing.T) {
|
|
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
w.WriteHeader(500)
|
|
}))
|
|
defer ts.Close()
|
|
|
|
mockServer := newMockServer(makeRemoteClusters(NumRemotes, ts.URL))
|
|
defer mockServer.Shutdown()
|
|
|
|
service, err := NewRemoteClusterService(mockServer)
|
|
require.NoError(t, err)
|
|
|
|
err = service.Start()
|
|
require.NoError(t, err)
|
|
defer service.Shutdown()
|
|
|
|
msg := makeRemoteClusterMsg(msgId, NoteContent)
|
|
var countCallbacks int32
|
|
var countErrors int32
|
|
wg := &sync.WaitGroup{}
|
|
wg.Add(NumRemotes)
|
|
|
|
err = service.BroadcastMsg(context.Background(), msg, func(msg model.RemoteClusterMsg, remote *model.RemoteCluster, resp *Response, err error) {
|
|
defer wg.Done()
|
|
atomic.AddInt32(&countCallbacks, 1)
|
|
if err != nil {
|
|
atomic.AddInt32(&countErrors, 1)
|
|
}
|
|
})
|
|
assert.NoError(t, err)
|
|
|
|
wg.Wait()
|
|
|
|
assert.Equal(t, int32(NumRemotes), atomic.LoadInt32(&countCallbacks))
|
|
assert.Equal(t, int32(NumRemotes), atomic.LoadInt32(&countErrors))
|
|
})
|
|
}
|
|
|
|
func makeRemoteClusters(num int, siteURL string) []*model.RemoteCluster {
|
|
var remotes []*model.RemoteCluster
|
|
for i := 0; i < num; i++ {
|
|
rc := makeRemoteCluster(fmt.Sprintf("test cluster %d", i+1), siteURL, TestTopics)
|
|
remotes = append(remotes, rc)
|
|
}
|
|
return remotes
|
|
}
|
|
|
|
func makeRemoteCluster(name string, siteURL string, topics string) *model.RemoteCluster {
|
|
return &model.RemoteCluster{
|
|
RemoteId: model.NewId(),
|
|
Name: name,
|
|
SiteURL: siteURL,
|
|
Token: model.NewId(),
|
|
Topics: topics,
|
|
CreateAt: model.GetMillis(),
|
|
LastPingAt: model.GetMillis(),
|
|
CreatorId: model.NewId(),
|
|
}
|
|
}
|
|
|
|
func makeRemoteClusterMsg(id string, note string) model.RemoteClusterMsg {
|
|
payload := testPayload{Note: note}
|
|
raw, _ := json.Marshal(payload)
|
|
|
|
return model.RemoteClusterMsg{
|
|
Id: id,
|
|
Topic: TestTopic,
|
|
CreateAt: model.GetMillis(),
|
|
Payload: raw}
|
|
}
|