snapshot of https://github.com/mattermost/mattermost.git (master, 2026-09-16; blobs > 131072B omitted)
Some checks failed
Server CI / Postgres (shard 0) (push) Has been skipped
Server CI / Postgres (shard 3) (push) Has been skipped
BuildEnv Docker Image / build-image (push) Failing after 4s
BuildEnv Docker Image / build-image-fips (push) Failing after 4s
Migration Review & Release Notes / Generate migration review & release notes (push) Failing after 3s
Server CI / Build Environment (push) Failing after 3s
Server CI / Postgres (shard 1) (push) Has been skipped
Tools CI / check-style (mattermost-govet) (push) Failing after 4s
Server CI / Postgres (shard 2) (push) Has been skipped
Tools CI / check-style (mmgotool) (push) Failing after 3s
Server CI / Elasticsearch v8 Compatibility (push) Has been skipped
Server CI / OpenSearch v2 Compatibility (push) Has been skipped
Server CI / Postgres FIPS (shard 0) (push) Has been skipped
Tools CI / Test (mattermost-govet) (push) Failing after 3s
Server CI / Postgres FIPS (shard 1) (push) Has been skipped
Server CI / Postgres FIPS (shard 2) (push) Has been skipped
Tools CI / Test (mmgotool) (push) Failing after 3s
Server CI / Postgres FIPS (shard 3) (push) Has been skipped
Server CI / Run mmctl tests (push) Has been skipped
Server CI / Run mmctl tests (FIPS) (push) Has been skipped
Server CI / Merge Postgres Test Results (push) Has been skipped
Server CI / Merge Postgres FIPS Test Results (push) Has been skipped
Server CI / Check backport migrations (push) Has been skipped
Server CI / Check generated files (push) Has been skipped
Server CI / check-style (push) Has been skipped
Server CI / Vet API (push) Has been skipped
Server CI / Build mattermost server app (push) Has been skipped
Server CI / Server CI Complete (push) Failing after 2s
Server CI / Server CI Artifacts (push) Has been skipped
Server CI / Sentry Upload (push) Has been skipped
Server CI / Server CI Report (push) Failing after 5m1s
Server CI Nightly Race / Race Detector (push) Has been skipped
CodeQL / Analyze (go) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Webapp CI Cache Warm / Warm Webapp node_modules Cache (push) Has been cancelled
E2E CI Cache Warm / Warm E2E npm Registry Cache (push) Has been cancelled
API / build (push) Has been cancelled
Web App CI / check-types (push) Has been cancelled
Web App CI / check-lint (push) Has been cancelled
Web App CI / check-i18n (push) Has been cancelled
Web App CI / check-external-links (push) Has been cancelled
Web App CI / test (platform) (push) Has been cancelled
Web App CI / test (mattermost-redux) (push) Has been cancelled
Web App CI / test (channels shard 1/4) (push) Has been cancelled
Web App CI / test (channels shard 2/4) (push) Has been cancelled
Web App CI / test (channels shard 3/4) (push) Has been cancelled
Web App CI / test (channels shard 4/4) (push) Has been cancelled
Web App CI / upload-coverage (push) Has been cancelled
Web App CI / build (push) Has been cancelled
YAML Lint / yamllint (push) Has been cancelled
Push mirrored docker images / cd/Push mirrored docker images (push) Has been cancelled
docs-cd / Build and deploy docs (push) Has been cancelled
Docs CI / build (push) Has been cancelled
E2E Cache Warm: Cypress deps / Warm Cypress deps cache (push) Has been cancelled
Scorecards supply-chain security / Scorecard analysis (push) Has been cancelled
Server CI Weekly / Postgres FIPS (push) Has been skipped
Server CI Weekly / Run mmctl tests (FIPS) (push) Has been skipped
Server CI Weekly / Postgres with binary parameters (push) Has been skipped
Server CI Weekly / Build Environment (push) Failing after 1s
Server CI Cache Warm / Warm Go Module and Build Cache (push) Failing after 2s
Server CI Nightly Race / Build Environment (push) Failing after 1s
Some checks failed
Server CI / Postgres (shard 0) (push) Has been skipped
Server CI / Postgres (shard 3) (push) Has been skipped
BuildEnv Docker Image / build-image (push) Failing after 4s
BuildEnv Docker Image / build-image-fips (push) Failing after 4s
Migration Review & Release Notes / Generate migration review & release notes (push) Failing after 3s
Server CI / Build Environment (push) Failing after 3s
Server CI / Postgres (shard 1) (push) Has been skipped
Tools CI / check-style (mattermost-govet) (push) Failing after 4s
Server CI / Postgres (shard 2) (push) Has been skipped
Tools CI / check-style (mmgotool) (push) Failing after 3s
Server CI / Elasticsearch v8 Compatibility (push) Has been skipped
Server CI / OpenSearch v2 Compatibility (push) Has been skipped
Server CI / Postgres FIPS (shard 0) (push) Has been skipped
Tools CI / Test (mattermost-govet) (push) Failing after 3s
Server CI / Postgres FIPS (shard 1) (push) Has been skipped
Server CI / Postgres FIPS (shard 2) (push) Has been skipped
Tools CI / Test (mmgotool) (push) Failing after 3s
Server CI / Postgres FIPS (shard 3) (push) Has been skipped
Server CI / Run mmctl tests (push) Has been skipped
Server CI / Run mmctl tests (FIPS) (push) Has been skipped
Server CI / Merge Postgres Test Results (push) Has been skipped
Server CI / Merge Postgres FIPS Test Results (push) Has been skipped
Server CI / Check backport migrations (push) Has been skipped
Server CI / Check generated files (push) Has been skipped
Server CI / check-style (push) Has been skipped
Server CI / Vet API (push) Has been skipped
Server CI / Build mattermost server app (push) Has been skipped
Server CI / Server CI Complete (push) Failing after 2s
Server CI / Server CI Artifacts (push) Has been skipped
Server CI / Sentry Upload (push) Has been skipped
Server CI / Server CI Report (push) Failing after 5m1s
Server CI Nightly Race / Race Detector (push) Has been skipped
CodeQL / Analyze (go) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Webapp CI Cache Warm / Warm Webapp node_modules Cache (push) Has been cancelled
E2E CI Cache Warm / Warm E2E npm Registry Cache (push) Has been cancelled
API / build (push) Has been cancelled
Web App CI / check-types (push) Has been cancelled
Web App CI / check-lint (push) Has been cancelled
Web App CI / check-i18n (push) Has been cancelled
Web App CI / check-external-links (push) Has been cancelled
Web App CI / test (platform) (push) Has been cancelled
Web App CI / test (mattermost-redux) (push) Has been cancelled
Web App CI / test (channels shard 1/4) (push) Has been cancelled
Web App CI / test (channels shard 2/4) (push) Has been cancelled
Web App CI / test (channels shard 3/4) (push) Has been cancelled
Web App CI / test (channels shard 4/4) (push) Has been cancelled
Web App CI / upload-coverage (push) Has been cancelled
Web App CI / build (push) Has been cancelled
YAML Lint / yamllint (push) Has been cancelled
Push mirrored docker images / cd/Push mirrored docker images (push) Has been cancelled
docs-cd / Build and deploy docs (push) Has been cancelled
Docs CI / build (push) Has been cancelled
E2E Cache Warm: Cypress deps / Warm Cypress deps cache (push) Has been cancelled
Scorecards supply-chain security / Scorecard analysis (push) Has been cancelled
Server CI Weekly / Postgres FIPS (push) Has been skipped
Server CI Weekly / Run mmctl tests (FIPS) (push) Has been skipped
Server CI Weekly / Postgres with binary parameters (push) Has been skipped
Server CI Weekly / Build Environment (push) Failing after 1s
Server CI Cache Warm / Warm Go Module and Build Cache (push) Failing after 2s
Server CI Nightly Race / Build Environment (push) Failing after 1s
This commit is contained in:
170
server/channels/utils/merge.go
Normal file
170
server/channels/utils/merge.go
Normal file
@@ -0,0 +1,170 @@
|
||||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
||||
// See LICENSE.txt for license information.
|
||||
|
||||
package utils
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"reflect"
|
||||
)
|
||||
|
||||
// StructFieldFilter defines a callback function used to decide if a patch value should be applied.
|
||||
type StructFieldFilter func(structField reflect.StructField, base reflect.Value, patch reflect.Value) bool
|
||||
|
||||
// MergeConfig allows for optional merge customizations.
|
||||
type MergeConfig struct {
|
||||
StructFieldFilter StructFieldFilter
|
||||
}
|
||||
|
||||
// Merge will return a new value of the same type as base and patch, recursively merging non-nil values from patch on top of base.
|
||||
//
|
||||
// Restrictions/guarantees:
|
||||
// - base and patch must be the same type
|
||||
// - base and patch will never be modified
|
||||
// - values from patch are always selected when non-nil
|
||||
// - structs are merged recursively
|
||||
// - maps and slices are treated as pointers, and merged as a single value
|
||||
//
|
||||
// Note that callers need to cast the returned interface back into the original type:
|
||||
//
|
||||
// func mergeTestStruct(base, patch *testStruct) (*testStruct, error) {
|
||||
// ret, err := merge(base, patch)
|
||||
// if err != nil {
|
||||
// return nil, err
|
||||
// }
|
||||
//
|
||||
// retTS := ret.(testStruct)
|
||||
// return &retTS, nil
|
||||
// }
|
||||
func Merge[T any](base T, patch T, mergeConfig *MergeConfig) (T, error) {
|
||||
commonType := reflect.TypeOf(base)
|
||||
baseVal := reflect.ValueOf(base)
|
||||
patchVal := reflect.ValueOf(patch)
|
||||
ret := reflect.New(commonType)
|
||||
|
||||
val, ok := merge(baseVal, patchVal, mergeConfig)
|
||||
if ok {
|
||||
ret.Elem().Set(val)
|
||||
}
|
||||
|
||||
r, ok := ret.Elem().Interface().(T)
|
||||
if !ok {
|
||||
return r, fmt.Errorf(
|
||||
"Unexpected type of return element, expected %s, is %s",
|
||||
commonType,
|
||||
reflect.TypeOf(r),
|
||||
)
|
||||
}
|
||||
|
||||
return r, nil
|
||||
}
|
||||
|
||||
// merge recursively merges patch into base and returns the new struct, ptr, slice/map, or value
|
||||
func merge(base, patch reflect.Value, mergeConfig *MergeConfig) (reflect.Value, bool) {
|
||||
commonType := base.Type()
|
||||
|
||||
switch commonType.Kind() {
|
||||
case reflect.Struct:
|
||||
merged := reflect.New(commonType).Elem()
|
||||
for i := range base.NumField() {
|
||||
if !merged.Field(i).CanSet() {
|
||||
continue
|
||||
}
|
||||
if mergeConfig != nil && mergeConfig.StructFieldFilter != nil {
|
||||
if !mergeConfig.StructFieldFilter(commonType.Field(i), base.Field(i), patch.Field(i)) {
|
||||
merged.Field(i).Set(base.Field(i))
|
||||
continue
|
||||
}
|
||||
}
|
||||
val, ok := merge(base.Field(i), patch.Field(i), mergeConfig)
|
||||
if ok {
|
||||
merged.Field(i).Set(val)
|
||||
}
|
||||
}
|
||||
return merged, true
|
||||
|
||||
case reflect.Pointer:
|
||||
mergedPtr := reflect.New(commonType.Elem())
|
||||
if base.IsNil() && patch.IsNil() {
|
||||
return mergedPtr, false
|
||||
}
|
||||
|
||||
// clone reference values (if any)
|
||||
if base.IsNil() {
|
||||
val, _ := merge(patch.Elem(), patch.Elem(), mergeConfig)
|
||||
mergedPtr.Elem().Set(val)
|
||||
} else if patch.IsNil() {
|
||||
val, _ := merge(base.Elem(), base.Elem(), mergeConfig)
|
||||
mergedPtr.Elem().Set(val)
|
||||
} else {
|
||||
val, _ := merge(base.Elem(), patch.Elem(), mergeConfig)
|
||||
mergedPtr.Elem().Set(val)
|
||||
}
|
||||
return mergedPtr, true
|
||||
|
||||
case reflect.Slice:
|
||||
if base.IsNil() && patch.IsNil() {
|
||||
return reflect.Zero(commonType), false
|
||||
}
|
||||
if !patch.IsNil() {
|
||||
// use patch
|
||||
merged := reflect.MakeSlice(commonType, 0, patch.Len())
|
||||
for i := range patch.Len() {
|
||||
// recursively merge patch with itself. This will clone reference values.
|
||||
val, _ := merge(patch.Index(i), patch.Index(i), mergeConfig)
|
||||
merged = reflect.Append(merged, val)
|
||||
}
|
||||
return merged, true
|
||||
}
|
||||
// use base
|
||||
merged := reflect.MakeSlice(commonType, 0, base.Len())
|
||||
for i := range base.Len() {
|
||||
// recursively merge base with itself. This will clone reference values.
|
||||
val, _ := merge(base.Index(i), base.Index(i), mergeConfig)
|
||||
merged = reflect.Append(merged, val)
|
||||
}
|
||||
return merged, true
|
||||
|
||||
case reflect.Map:
|
||||
// maps are merged according to these rules:
|
||||
// - if patch is not nil, replace the base map completely
|
||||
// - otherwise, keep the base map
|
||||
// - reference values (eg. slice/ptr/map) will be cloned
|
||||
if base.IsNil() && patch.IsNil() {
|
||||
return reflect.Zero(commonType), false
|
||||
}
|
||||
merged := reflect.MakeMap(commonType)
|
||||
mapPtr := base
|
||||
if !patch.IsNil() {
|
||||
mapPtr = patch
|
||||
}
|
||||
for _, key := range mapPtr.MapKeys() {
|
||||
// clone reference values
|
||||
val, ok := merge(mapPtr.MapIndex(key), mapPtr.MapIndex(key), mergeConfig)
|
||||
if !ok {
|
||||
val = reflect.New(mapPtr.MapIndex(key).Type()).Elem()
|
||||
}
|
||||
merged.SetMapIndex(key, val)
|
||||
}
|
||||
return merged, true
|
||||
|
||||
case reflect.Interface:
|
||||
var val reflect.Value
|
||||
if base.IsNil() && patch.IsNil() {
|
||||
return reflect.Zero(commonType), false
|
||||
}
|
||||
|
||||
// clone reference values (if any)
|
||||
if base.IsNil() {
|
||||
val, _ = merge(patch.Elem(), patch.Elem(), mergeConfig)
|
||||
} else if patch.IsNil() {
|
||||
val, _ = merge(base.Elem(), base.Elem(), mergeConfig)
|
||||
} else {
|
||||
val, _ = merge(base.Elem(), patch.Elem(), mergeConfig)
|
||||
}
|
||||
return val, true
|
||||
|
||||
default:
|
||||
return patch, true
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user