tarantool / go-config / 26364104799

87%

master: 87%

Build Type

push

github

Committed by bigbes

Commit Message

config: deep-merge maps by default during scope-chain inheritance

foldScopeChainInto used MergeReplace as the implicit default, which
wholesale-replaced any top-level map a higher-priority scope touched
even if it only set one nested sub-key. The cross-loader accumulator
(accumulateLayerResult) already special-cased MergeReplace to recursively
merge map nodes — single-loader scope-chain resolution did not.

The two-scope mismatch silently dropped data in real Tarantool configs:
a group declaring roles_cfg.<role>.advertise.params.transport disappeared
as soon as an instance set roles_cfg.<role>.advertise.uri, and a global
iproto.advertise.{sharding,peer}.login was wiped by any instance that
declared iproto.listen.

- Make MergeDeep the default returned by strategyFor when no explicit
  per-key strategy is registered. Leaf semantics (higher-priority wins)
  are unchanged; maps now recursively merge end-to-end. Explicit
  WithInheritMerge(key, MergeReplace) still means wholesale replace.
- Prune WithNoInherit and WithNoInheritFrom prefixes from each non-leaf
  layer before folding, mirroring the tombstone path. Nested-path
  exclusions were previously checked only against top-level iteration
  keys and never matched anything deeper.
- Add TestWithInheritance_CrossScope_{NonConflictingSubkeysCoexist,
  ConflictingLeafHigherPriorityWins} as scope-chain analogues of the
  existing TestLayered_CrossLoader_* invariants.

Coverage Stats

13 of 13 new or added lines in 1 file covered. (100.0%)

9 existing lines in 1 file now uncovered.

3824 of 4408 relevant lines covered (86.75%)

112.71 hits per line