Skip to content

Fix issue with merging observations config #31248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VioletHynes merged 1 commit into from
Jul 10, 2025
Merged

Fix issue with merging observations config #31248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions command/server/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,8 +447,8 @@ func (c *Config) Merge(c2 *Config) *Config {
if c2.Observations.LedgerPath != "" {
result.Observations.LedgerPath = c2.Observations.LedgerPath
}
result.Observations.TypePrefixDenylist = append(c.Observations.TypePrefixDenylist, c2.Observations.TypePrefixDenylist...)
result.Observations.TypePrefixAllowlist = append(c.Observations.TypePrefixAllowlist, c2.Observations.TypePrefixAllowlist...)
result.Observations.TypePrefixDenylist = append(result.Observations.TypePrefixDenylist, c2.Observations.TypePrefixDenylist...)
result.Observations.TypePrefixAllowlist = append(result.Observations.TypePrefixAllowlist, c2.Observations.TypePrefixAllowlist...)
if c2.Observations.FileMode != "" {
result.Observations.FileMode = c2.Observations.FileMode
}
Expand Down
21 changes: 21 additions & 0 deletions command/server/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,27 @@ func Test_ObservationSystemConfigMerge(t *testing.T) {
require.Equal(t, "0777", merged.Observations.FileMode)
}

// Test_ObservationSystemConfigMergeFromNoObservations checks merge for observation system config from a config
// without an observation system defined
func Test_ObservationSystemConfigMergeFromNoObservations(t *testing.T) {
config, err := LoadConfigFile("./test-fixtures/config.hcl")
require.NoError(t, err)
require.NotNil(t, config)

config2, err := LoadConfigFile("./test-fixtures/observations_allow_deny.hcl")
require.NoError(t, err)
require.NotNil(t, config2)

merged := config.Merge(config2)
require.NotNil(t, merged)
require.NotNil(t, merged.Observations)
require.Equal(t, "/var/ledger.log", merged.Observations.LedgerPath)
require.Equal(t, []string{"deny1", "deny2"}, merged.Observations.TypePrefixDenylist)
require.Equal(t, []string{"allow1", "allow2", "allow3"}, merged.Observations.TypePrefixAllowlist)
require.Equal(t, "0777", merged.Observations.FileMode)
require.Equal(t, true, merged.EnableUI)
}

// TestDuplicateKeyValidationHcl checks that the server command displays a warning when the HCL config file contains duplicate keys.
func TestDuplicateKeyValidationHcl(t *testing.T) {
testDuplicateKeyValidationHcl(t)
Expand Down
Loading