mirror of
https://github.com/hanzoai/team.git
synced 2026-09-30 01:57:35 +00:00
* ci: shard server Postgres tests into 4 parallel runners (#35739) Cherry-pick of00296f9b49from master. * updated go to version 1.25.8 (#35817) Cherry-pick of32a10bac62from master. * Move password hashers from server/v8 to server/public (#35805) Cherry-pick ofcca3f08574from master. * Generate instead of hard-coding test passwords, enforce new minimum for FIPS, shard CI, fix FIPS builds (#35905) Cherry-pick of1bdd985b41from master. * upgrade golangci-lint (#35845) Cherry-pick of157e0400b2from master. On release-11.4 (unlike 11.5), UpdatePostsChannelTypeByChannelId and BackfillPostsChannelType exist in the elasticsearch/opensearch files, so the imports they require (fmt, updatebyquery, scriptlanguage) must be added — they were not in the cherry-pick diff since they already existed on master. Also updates html2text/tablewriter/olekukonko deps to fix a workspace conflict where enterprise's Go 1.25.8 bump pulled in a newer html2text that requires tablewriter ≥ 1.1 (was pinned to 0.0.5 via a replace directive). Matches the subset of866f759e4b(Mm 66662 bump deps) relevant to this incompatibility. * Fix FIPS-incompatible passwords and config in e2e test suites (#36001) Cherry-pick ofb51b4a8937from master. release-11.4 differences vs release-11.5: - demo_plugin_installation.spec.ts also deleted (modify/delete conflict, git rm) - authentication_2_spec.ts conflict: HEAD missing check() call; took incoming (check + FIPS-length passwords) - member_invitation_ui_spec.ts: HEAD has 'Create Account' (capital A) matching release-11.4 button text; kept HEAD's button text with incoming's newTestPassword() * fix(cypress): demo plugin (#36056) Cherry-pick of39f1979aa5from master. demo_plugin_installation.spec.ts was deleted in step 10 (modify/delete); re-created here with both the FIPS-password change and the URL fix. * test: clean up channel store data after TestChannelStore (#36066) TestChannelStore sub-tests create channels, members, and team members using fake TeamIds and UserIds (model.NewId() for non-existent rows). These records are left in the database and cause integrity tests (TestCheck*) running in the same binary to fail their full-table scans. Register a t.Cleanup on TestChannelStore that purges the affected tables entirely. A blanket purge is safe: the schema enforces no FK constraints, and every test suite creates its own data independently. * Fix command injection in server-test-template workflow (#36080) Cherry-pick of9223935f16from master. * fix(ci): restore testname format in sharded gotestsum runs (#36078) run-shard-tests.sh called gotestsum directly without --format, so it fell back to gotestsum's default (pkgname) instead of the testname format set by the Makefile. Pass --format "${GOTESTSUM_FORMAT:-testname}" to match the Makefile default. Co-authored-by: Mattermost Build <[email protected]> * fixup: drop demo_plugin playwright specs — master-only APIs demo_plugin/helpers.ts and demo_plugin_installation.spec.ts use installAndEnablePlugin and isPluginActive which don't exist on release-11.4's PlaywrightExtended type. These files were re-created by the step-11 cherry-pick of39f1979aa5, but they don't compile on this branch (same class of problem as actions.spec.ts in step 10). * fixup: add missing await in PluginLinkTooltip test The test added in39f1979aa5is missing an await on renderWithContext, causing the pointer-events assertion to race. Fix from 0c7d3f27c6 (on a feature branch, not yet on master). * fixup: drop pointer-events test incompatible with jsdom@20 The 'should not block interaction with elements outside the tooltip' test checks getComputedStyle for pointer-events: none, which is set only in SCSS. release-11.4 uses jest-environment-jsdom@29 (jsdom@20), which does not apply stylesheets, so getComputedStyle always returns "". The test passes on release-11.5+ only because they use jest-environment-jsdom@30 (jsdom@25+). Drop the test rather than backport the jsdom upgrade. * fixup: add missing i18n keys for elasticsearch/opensearch functions BackfillPostsChannelType and UpdatePostsChannelTypeByChannelId exist on release-11.4 (unlike release-11.5+). The golangci-lint cherry-pick added new error strings to those functions referencing i18n keys that weren't in en.json. * fixup: run make i18n-extract to reorder keys correctly * fixup: drop terms-and-privacy checkbox from MM-T1774 on release-11.4 The #signup-body-card-form-check-terms-and-privacy element did not exist on release-11.4's signup page. It was added to master after this branch was cut, so the check() call from the incoming cherry-pick causes the test to fail with "element never found". * fixup: remove UpdatePostsChannelTypeByChannelId/BackfillPostsChannelType These functions were introduced by MM-67540 (allow searching public channel messages without channel membership), which never landed on release-11.4. The golangci-lint cherry-pick only modernizes existing code; the rerere resolution incorrectly added the full function bodies from master. Remove both functions and their now-unused imports (fmt, updatebyquery, scriptlanguage) from elasticsearch.go and opensearch.go. Also remove the two i18n keys added to support them. Same treatment as release-11.5, where these functions were also absent. --------- Co-authored-by: Mattermost Build <[email protected]>
209 lines
5.1 KiB
Go
209 lines
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/public/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 atomic.Int32
|
|
var countWebReq atomic.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)
|
|
}()
|
|
|
|
countWebReq.Add(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(t, makeRemoteClusters(NumRemotes, ts.URL, false))
|
|
mockApp := newMockApp(t, nil)
|
|
|
|
service, err := NewRemoteClusterService(mockServer, mockApp)
|
|
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()
|
|
countCallbacks.Add(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), countCallbacks.Load())
|
|
assert.Equal(t, int32(NumRemotes), countWebReq.Load())
|
|
t.Logf("%d callbacks counted; %d web requests counted; %d expected",
|
|
countCallbacks.Load(), countWebReq.Load(), 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(t, makeRemoteClusters(NumRemotes, ts.URL, false))
|
|
mockApp := newMockApp(t, nil)
|
|
|
|
service, err := NewRemoteClusterService(mockServer, mockApp)
|
|
require.NoError(t, err)
|
|
|
|
err = service.Start()
|
|
require.NoError(t, err)
|
|
defer service.Shutdown()
|
|
|
|
msg := makeRemoteClusterMsg(msgId, NoteContent)
|
|
var countCallbacks atomic.Int32
|
|
var countErrors atomic.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()
|
|
countCallbacks.Add(1)
|
|
if err != nil {
|
|
countErrors.Add(1)
|
|
}
|
|
})
|
|
assert.NoError(t, err)
|
|
|
|
wg.Wait()
|
|
|
|
assert.Equal(t, int32(NumRemotes), countCallbacks.Load())
|
|
assert.Equal(t, int32(NumRemotes), countErrors.Load())
|
|
})
|
|
}
|
|
|
|
func makeRemoteClusters(num int, siteURL string, isPlugin bool) []*model.RemoteCluster {
|
|
var remotes []*model.RemoteCluster
|
|
for i := range num {
|
|
rc := makeRemoteCluster(fmt.Sprintf("test cluster %d", i+1), siteURL, TestTopics)
|
|
if isPlugin {
|
|
rc.PluginID = model.NewId()
|
|
}
|
|
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}
|
|
}
|