Skip to content

Commit 3a8c8a0

Browse files
committed
Work with symbol keys
1 parent ad5b815 commit 3a8c8a0

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

lib/fluent/plugin/filter_masking.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@ def configure(conf)
5656
if fieldsToExcludeJSONPaths != nil && fieldsToExcludeJSONPaths.size() > 0
5757
fieldsToExcludeJSONPaths.split(",").each do | field |
5858
# To save splits we'll save the path as an array
59-
@fieldsToExcludeJSONPathsArray.push(field.split("."))
59+
splitArray = field.split(".")
60+
symArray = []
61+
splitArray.each do | pathPortion |
62+
symArray.push(pathPortion.to_sym)
63+
end
64+
@fieldsToExcludeJSONPathsArray.push(symArray)
6065
end
6166
end
6267

test/test_filter_masking.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,32 +102,32 @@ def filter(config, messages)
102102
test 'mask field in hash object with exclude' do
103103
conf = CONFIG
104104
messages = [
105-
{:not_masked_field=>"mickey-the-dog", :email=>"mickey-the-dog@zooz.com", :first_name=>"Micky", "excludedField"=>"first_name"}
105+
{:not_masked_field=>"mickey-the-dog", :email=>"mickey-the-dog@zooz.com", :first_name=>"Micky", :excludedField=>"first_name"}
106106
]
107107
expected = [
108-
{:not_masked_field=>"mickey-the-dog", :email=>MASK_STRING, :first_name=>"Micky", "excludedField"=>"first_name"}
108+
{:not_masked_field=>"mickey-the-dog", :email=>MASK_STRING, :first_name=>"Micky", :excludedField=>"first_name"}
109109
]
110110
filtered_records = filter(conf, messages)
111111
assert_equal(expected, filtered_records)
112112
end
113113
test 'mask field in hash object with nested exclude' do
114114
conf = CONFIG
115115
messages = [
116-
{:not_masked_field=>"mickey-the-dog", :last_name=>"the dog", :email=>"mickey-the-dog@zooz.com", :first_name=>"Micky", "exclude"=>{"path"=>{"nestedExcludedField"=>"first_name,last_name"}}}
116+
{:not_masked_field=>"mickey-the-dog", :last_name=>"the dog", :email=>"mickey-the-dog@zooz.com", :first_name=>"Micky", :exclude=>{:path=>{:nestedExcludedField=>"first_name,last_name"}}}
117117
]
118118
expected = [
119-
{:not_masked_field=>"mickey-the-dog", :last_name=>"the dog", :email=>MASK_STRING, :first_name=>"Micky", "exclude"=>{"path"=>{"nestedExcludedField"=>"first_name,last_name"}}}
119+
{:not_masked_field=>"mickey-the-dog", :last_name=>"the dog", :email=>MASK_STRING, :first_name=>"Micky", :exclude=>{:path=>{:nestedExcludedField=>"first_name,last_name"}}}
120120
]
121121
filtered_records = filter(conf, messages)
122122
assert_equal(expected, filtered_records)
123123
end
124124
test 'mask field in hash object with base and nested exclude' do
125125
conf = CONFIG
126126
messages = [
127-
{:not_masked_field=>"mickey-the-dog", :last_name=>"the dog", :email=>"mickey-the-dog@zooz.com", :first_name=>"Micky", "excludedField"=>"first_name", "exclude"=>{"path"=>{"nestedExcludedField"=>"last_name"}}}
127+
{:not_masked_field=>"mickey-the-dog", :last_name=>"the dog", :email=>"mickey-the-dog@zooz.com", :first_name=>"Micky", :excludedField=>"first_name", :exclude=>{:path=>{:nestedExcludedField=>"last_name"}}}
128128
]
129129
expected = [
130-
{:not_masked_field=>"mickey-the-dog", :last_name=>"the dog", :email=>MASK_STRING, :first_name=>"Micky", "excludedField"=>"first_name", "exclude"=>{"path"=>{"nestedExcludedField"=>"last_name"}}}
130+
{:not_masked_field=>"mickey-the-dog", :last_name=>"the dog", :email=>MASK_STRING, :first_name=>"Micky", :excludedField=>"first_name", :exclude=>{:path=>{:nestedExcludedField=>"last_name"}}}
131131
]
132132
filtered_records = filter(conf, messages)
133133
assert_equal(expected, filtered_records)

0 commit comments

Comments
 (0)