Merge branch 'master' into 132-support-policy-groups

elastic · Feb 23, 2021 · b1aff4e · b1aff4e
2 parents e9e7337 + 5411166
commit b1aff4e
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 21 deletions.
diff --git a/code/go/internal/spec/statik.go b/code/go/internal/spec/statik.go
diff --git a/test/packages/expanded/data_stream/foo/_dev/test/pipeline/test-access-raw.log-config.yml b/test/packages/expanded/data_stream/foo/_dev/test/pipeline/test-access-raw.log-config.yml
@@ -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
diff --git a/test/packages/good/data_stream/foo/_dev/test/pipeline/test-access-raw.log-config.json b/test/packages/good/data_stream/foo/_dev/test/pipeline/test-access-raw.log-config.json
diff --git a/test/packages/good/data_stream/foo/_dev/test/pipeline/test-access-raw.log-config.yml b/test/packages/good/data_stream/foo/_dev/test/pipeline/test-access-raw.log-config.yml
@@ -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+"
diff --git a/versions/1/changelog.yml b/versions/1/changelog.yml
@@ -76,6 +76,9 @@
   - 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
   - description: Add policy groups
     type: enhancement
     link: https://github.com/elastic/package-spec/pull/137
diff --git a/versions/1/data_stream/_dev/test/pipeline/spec.yml b/versions/1/data_stream/_dev/test/pipeline/spec.yml
@@ -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