Skip to content

Commit

Permalink
Tidy up operator testdata files (#398)
Browse files Browse the repository at this point in the history
* Ensure newline to end of all yaml files

* Clean up testdata file names in move operator

* Reorganize operator/helper testdata directories
  • Loading branch information
djaglowski authored Feb 18, 2022
1 parent aa3577f commit 20f9a11
Show file tree
Hide file tree
Showing 157 changed files with 167 additions and 167 deletions.
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/default.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
type: file_input
type: file_input
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/encoding_lower.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
encoding: "utf-16le"
encoding: "utf-16le"
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/encoding_upper.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
encoding: "UTF-16lE"
encoding: "UTF-16lE"
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/exclude_glob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ type: file_input
include:
- "*.log"
exclude:
- "not*.log"
- "not*.log"
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ type: file_input
include:
- "*.log"
exclude:
- "not**.log"
- "not**.log"
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ type: file_input
include:
- "*.log"
exclude:
- "directory/**/not*.log"
- "directory/**/not*.log"
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ type: file_input
include:
- "*.log"
exclude:
- "**/directory/**/not*.log"
- "**/directory/**/not*.log"
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/exclude_inline.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
type: file_input
include: [ "*.log" ]
exclude: [ "a.log", "b.log" ]
exclude: [ "a.log", "b.log" ]
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/exclude_invalid.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: file_input
include:
- "*.log"
exclude: "aRandomString"
exclude: "aRandomString"
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/exclude_multi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ include:
exclude:
- one.log
- two.log
- three.log
- three.log
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/exclude_one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ type: file_input
include:
- "*.log"
exclude:
- one.log
- one.log
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/extra_field.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
hello: world
hello: world
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
fingerprint_size: 1KB
fingerprint_size: 1KB
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
fingerprint_size: 1KiB
fingerprint_size: 1KiB
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
fingerprint_size: 1kb
fingerprint_size: 1kb
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
fingerprint_size: 1kib
fingerprint_size: 1kib
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
fingerprint_size: 1.1kb
fingerprint_size: 1.1kb
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
fingerprint_size: 1000
fingerprint_size: 1000
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/id_custom.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
id: test_id
id: test_id
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: file_input
include:
- one.log
include_file_name: true
include_file_name: true
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: file_input
include:
- one.log
include_file_name: on
include_file_name: on
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: file_input
include:
- one.log
include_file_name: TRUE
include_file_name: TRUE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: file_input
include:
- one.log
include_file_name: yes
include_file_name: yes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: file_input
include:
- one.log
include_file_path: true
include_file_path: true
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: file_input
include:
- one.log
include_file_path: no
include_file_path: no
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: file_input
include:
- one.log
include_file_path: asdf
include_file_path: asdf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: file_input
include:
- one.log
include_file_path: off
include_file_path: off
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: file_input
include:
- one.log
include_file_path: on
include_file_path: on
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: file_input
include:
- one.log
include_file_path: TRUE
include_file_path: TRUE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: file_input
include:
- one.log
include_file_path: yes
include_file_path: yes
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/include_glob.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
type: file_input
include:
- "*.log"
- "*.log"
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
type: file_input
include:
- "**.log"
- "**.log"
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
type: file_input
include:
- "directory/**/*.log"
- "directory/**/*.log"
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
type: file_input
include:
- "**/directory/**/*.log"
- "**/directory/**/*.log"
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/include_inline.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
include: [ "a.log", "b.log" ]
include: [ "a.log", "b.log" ]
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/include_invalid.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
include: "justwords"
include: "justwords"
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/include_multi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ type: file_input
include:
- one.log
- two.log
- three.log
- three.log
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/include_one.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
type: file_input
include:
- one.log
- one.log
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
max_concurrent_files: 9223372036854775807
max_concurrent_files: 9223372036854775807
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
max_log_size: 1TOFU
max_log_size: 1TOFU
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
max_log_size: 1mib
max_log_size: 1mib
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
max_log_size: 1MiB
max_log_size: 1MiB
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
max_log_size: 1mib
max_log_size: 1mib
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
max_log_size: 1MiB
max_log_size: 1MiB
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
type: file_input
multiline:
that_random_field: "this should go nowhere"
that_random_field: "this should go nowhere"
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
type: file_input
multiline:
line_end_pattern: '%'
line_end_pattern: '%'
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
type: file_input
multiline:
line_end_pattern: 'Start'
line_end_pattern: 'Start'
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
type: file_input
multiline:
line_start_pattern: '%'
line_start_pattern: '%'
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
type: file_input
multiline:
line_start_pattern: 'Start'
line_start_pattern: 'Start'
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
poll_interval: 1000ms
poll_interval: 1000ms
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
poll_interval: 1ms
poll_interval: 1ms
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/poll_interval_1s.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
poll_interval: 1s
poll_interval: 1s
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
poll_interval: 1
poll_interval: 1
2 changes: 1 addition & 1 deletion operator/builtin/input/file/testdata/start_at_string.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: file_input
start_at: "beginning"
start_at: "beginning"
2 changes: 1 addition & 1 deletion operator/builtin/parser/csv/testdata/basic.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
type: csv_parser
parse_from: message
header: id,severity,message
header: id,severity,message
2 changes: 1 addition & 1 deletion operator/builtin/parser/csv/testdata/delimiter.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: csv_parser
parse_from: message
header: id,severity,message
delimiter: "\t"
delimiter: "\t"
2 changes: 1 addition & 1 deletion operator/builtin/parser/csv/testdata/timestamp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ header: timestamp_field,severity,message
timestamp:
parse_from: timestamp_field
layout_type: strptime
layout: '%Y-%m-%d'
layout: '%Y-%m-%d'
2 changes: 1 addition & 1 deletion operator/builtin/parser/json/testdata/default.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
type: json_parser
type: json_parser
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: json_parser
parse_from: $.from
parse_from: $.from
2 changes: 1 addition & 1 deletion operator/builtin/parser/json/testdata/parse_to_simple.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: json_parser
parse_to: log
parse_to: log
2 changes: 1 addition & 1 deletion operator/builtin/parser/json/testdata/preserve_to.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: json_parser
preserve_to: aField
preserve_to: aField
2 changes: 1 addition & 1 deletion operator/builtin/parser/json/testdata/severity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ severity:
critical: 5xx
error: 4xx
info: 3xx
debug: 2xx
debug: 2xx
2 changes: 1 addition & 1 deletion operator/builtin/parser/json/testdata/timestamp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ type: json_parser
timestamp:
parse_from: timestamp_field
layout_type: strptime
layout: '%Y-%m-%d'
layout: '%Y-%m-%d'
2 changes: 1 addition & 1 deletion operator/builtin/parser/regex/testdata/default.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
type: regex_parser
type: regex_parser
2 changes: 1 addition & 1 deletion operator/builtin/parser/regex/testdata/on_error_drop.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: regex_parser
on_error: "drop"
on_error: "drop"
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: regex_parser
parse_from: "$.from"
parse_from: "$.from"
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: regex_parser
parse_to: "log"
parse_to: "log"
2 changes: 1 addition & 1 deletion operator/builtin/parser/regex/testdata/preserve_to.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: regex_parser
preserve_to: "aField"
preserve_to: "aField"
2 changes: 1 addition & 1 deletion operator/builtin/parser/regex/testdata/regex.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type: regex_parser
regex: '^Host=(?P<host>[^,]+), Type=(?P<type>.*)$'
regex: '^Host=(?P<host>[^,]+), Type=(?P<type>.*)$'
Loading

0 comments on commit 20f9a11

Please sign in to comment.