Skip to content

Deprecating JSON-formatted pipeline test configs in favor of YAML-formatted ones #139

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
ycombinator merged 6 commits into from
Feb 22, 2021
Merged

Deprecating JSON-formatted pipeline test configs in favor of YAML-formatted ones #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
237865f
Deprecating JSON-formatted pipeline test configs in favor of YAML-for…
ycombinator Feb 19, 2021
8703786
Adding CHANGELOG entry
ycombinator Feb 19, 2021
897f6c5
Updating test packages
ycombinator Feb 19, 2021
da8745e
Updating specs
ycombinator Feb 19, 2021
faea7ad
Fixing indentation
ycombinator Feb 19, 2021
ebb4083
Removing trailing comma
ycombinator Feb 19, 2021
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
2 changes: 1 addition & 1 deletion code/go/internal/spec/statik.go
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions test/packages/expanded/data_stream/foo/_dev/test/pipeline/test-access-raw.log-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
multiline:
first_line_pattern: "^(?:[0-9]{1,3}\\.){3}[0-9]{1,3}"
fields:
"@timestamp": "2020-04-28T11:07:58.223Z"
ecs.version: "1.5.0"
event.category:
- web
18 changes: 0 additions & 18 deletions test/packages/good/data_stream/foo/_dev/test/pipeline/test-access-raw.log-config.json
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions test/packages/good/data_stream/foo/_dev/test/pipeline/test-access-raw.log-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
multiline:
first_line_pattern: "^(?:[0-9]{1,3}\\.){3}[0-9]{1,3}"
fields:
"@timestamp": "2020-04-28T11:07:58.223Z"
ecs.version: "1.5.0"
event.category:
- web
dynamic_fields:
foobar: ".+"
a_numeric_field: "\\d+"
3 changes: 3 additions & 0 deletions versions/1/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,7 @@
- description: Add specification for package CHANGELOG files.
type: enhancement
link: https://github.com/elastic/package-spec/pull/131
- description: Deprecate JSON-formatted pipeline test configs in favor of YAML-formatted ones
type: enhancement
link: https://github.com/elastic/package-spec/pull/139

18 changes: 16 additions & 2 deletions versions/1/data_stream/_dev/test/pipeline/spec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,31 @@ spec:
type: file
pattern: '^test-[a-z0-9-]+\.log$'
required: false
- description: Configuration of test case in raw format
- description: JSON-formatted configuration for a test case in raw format
type: file
pattern: '^test-[a-z0-9-]+\.log-config.json$'
contentMediaType: "application/json"
required: false
deprecated: true # use "YAML-formatted configuration for a test case in raw format"
$ref: "./config_raw.spec.yml"
- description: Configuration of test case in JSON format
- description: JSON-formatted configuration for a test case in JSON format
type: file
pattern: '^test-[a-z0-9-]+\.json-config.json$'
contentMediaType: "application/json"
required: false
deprecated: true # use "YAML-formatted configuration for a test case in JSON format"
$ref: "./config_json.spec.yml"
- description: YAML-formatted configuration for a test case in raw format
type: file
pattern: '^test-[a-z0-9-]+\.log-config.yml'
contentMediaType: "application/x-yaml"
required: false
$ref: "./config_raw.spec.yml"
- description: YAML-formatted configuration for a test case in JSON format
type: file
pattern: '^test-[a-z0-9-]+\.json-config.yml'
contentMediaType: "application/x-yaml"
required: false
$ref: "./config_json.spec.yml"
- description: Expected test results
type: file
Expand Down