Rename config template to policy template and dataset to datastream (#…

…641) * WIP * Move from dataset to data_stream * Regenerate golden files * Update CHANGELOG * Fix: mage format * Rename name to dataset * Fix: mage format * More fixes * Fix * Fix
elastic · Sep 30, 2020 · dd7b021 · dd7b021
1 parent 868db07
commit dd7b021
Show file tree

Hide file tree

Showing 58 changed files with 146 additions and 144 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Breaking changes
 
+* Rename config template to policy template and dataset to data stream. [#641](https://github.com/elastic/package-registry/pull/641)
+
 ### Bugfixes
 
 ### Added

diff --git a/openapi.yml b/openapi.yml
@@ -169,8 +169,8 @@ components:
           $ref: '#/components/schemas/ProductRequirement'
       required:
         - Kibana
-    Dataset:
-      title: Dataset
+    DataStream:
+      title: DataStream
       type: object
       properties:
         type:
@@ -325,23 +325,23 @@ components:
               type: array
               items:
                 type: string
-            config_templates:
+            policy_templates:
               type: array
               items:
-                $ref: '#/components/schemas/ConfigTemplate'
-            datasets:
+                $ref: '#/components/schemas/PolicyTemplate'
+            data_streams:
               type: array
               items:
-                $ref: '#/components/schemas/Dataset'
+                $ref: '#/components/schemas/DataStream'
             owner:
               $ref: '#/components/schemas/Owner'
           required:
             - format_version
             - categories
             - requirement
       description: ''
-    ConfigTemplate:
-      title: ConfigTemplate
+    PolicyTemplate:
+      title: PolicyTemplate
       type: object
       properties:
         name:

diff --git a/testdata/generated/package.json b/testdata/generated/package.json
@@ -31,23 +31,23 @@
     "/package/example/1.0.0/docs/README.md",
     "/package/example/1.0.0/img/icon.png",
     "/package/example/1.0.0/img/kibana-envoyproxy.jpg",
-    "/package/example/1.0.0/dataset/foo/manifest.yml",
+    "/package/example/1.0.0/data_stream/foo/manifest.yml",
     "/package/example/1.0.0/kibana/dashboard/0c610510-5cbd-11e9-8477-077ec9664dbd.json",
     "/package/example/1.0.0/kibana/visualization/0a994af0-5c9d-11e9-8477-077ec9664dbd.json",
     "/package/example/1.0.0/kibana/visualization/36f872a0-5c03-11e9-85b4-19d0072eb4f2.json",
     "/package/example/1.0.0/kibana/visualization/38f96190-5c99-11e9-8477-077ec9664dbd.json",
     "/package/example/1.0.0/kibana/visualization/7e4084e0-5c99-11e9-8477-077ec9664dbd.json",
     "/package/example/1.0.0/kibana/visualization/80844540-5c97-11e9-8477-077ec9664dbd.json",
     "/package/example/1.0.0/kibana/visualization/ab48c3f0-5ca6-11e9-8477-077ec9664dbd.json",
-    "/package/example/1.0.0/dataset/foo/fields/base-fields.yml",
-    "/package/example/1.0.0/dataset/foo/agent/stream/stream.yml.hbs",
-    "/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-entry.json",
-    "/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-http.json",
-    "/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-json.json",
-    "/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-plaintext.json",
-    "/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-tcp.json"
+    "/package/example/1.0.0/data_stream/foo/fields/base-fields.yml",
+    "/package/example/1.0.0/data_stream/foo/agent/stream/stream.yml.hbs",
+    "/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-entry.json",
+    "/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-http.json",
+    "/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-json.json",
+    "/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-plaintext.json",
+    "/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-tcp.json"
   ],
-  "config_templates": [
+  "policy_templates": [
     {
       "name": "logs",
       "title": "Logs datasource",
@@ -60,10 +60,10 @@
       "multiple": true
     }
   ],
-  "datasets": [
+  "data_streams": [
     {
       "type": "logs",
-      "name": "bar.noo",
+      "dataset": "example.foo",
       "title": "Foo",
       "release": "experimental",
       "ingest_pipeline": "pipeline-entry",

diff --git a/testdata/generated/package/datasources/1.0.0/index.json b/testdata/generated/package/datasources/1.0.0/index.json
@@ -16,18 +16,18 @@
   "assets": [
     "/package/datasources/1.0.0/manifest.yml",
     "/package/datasources/1.0.0/docs/README.md",
-    "/package/datasources/1.0.0/dataset/examplelog1/manifest.yml",
-    "/package/datasources/1.0.0/dataset/examplelog2/manifest.yml",
-    "/package/datasources/1.0.0/dataset/examplemetric/manifest.yml",
-    "/package/datasources/1.0.0/dataset/examplelog1/fields/base-fields.yml",
-    "/package/datasources/1.0.0/dataset/examplelog2/fields/base-fields.yml",
-    "/package/datasources/1.0.0/dataset/examplemetric/fields/base-fields.yml",
-    "/package/datasources/1.0.0/dataset/examplelog1/agent/stream/logs.yml",
-    "/package/datasources/1.0.0/dataset/examplelog1/agent/stream/syslog.yml",
-    "/package/datasources/1.0.0/dataset/examplelog2/agent/stream/stream.yml.hbs",
-    "/package/datasources/1.0.0/dataset/examplemetric/agent/stream/stream.yml.hbs"
+    "/package/datasources/1.0.0/data_stream/examplelog1/manifest.yml",
+    "/package/datasources/1.0.0/data_stream/examplelog2/manifest.yml",
+    "/package/datasources/1.0.0/data_stream/examplemetric/manifest.yml",
+    "/package/datasources/1.0.0/data_stream/examplelog1/fields/base-fields.yml",
+    "/package/datasources/1.0.0/data_stream/examplelog2/fields/base-fields.yml",
+    "/package/datasources/1.0.0/data_stream/examplemetric/fields/base-fields.yml",
+    "/package/datasources/1.0.0/data_stream/examplelog1/agent/stream/logs.yml",
+    "/package/datasources/1.0.0/data_stream/examplelog1/agent/stream/syslog.yml",
+    "/package/datasources/1.0.0/data_stream/examplelog2/agent/stream/stream.yml.hbs",
+    "/package/datasources/1.0.0/data_stream/examplemetric/agent/stream/stream.yml.hbs"
   ],
-  "config_templates": [
+  "policy_templates": [
     {
       "name": "nginx",
       "title": "Datasource title",
@@ -84,10 +84,10 @@
       "multiple": true
     }
   ],
-  "datasets": [
+  "data_streams": [
     {
       "type": "logs",
-      "name": "datasources.examplelog1",
+      "dataset": "datasources.examplelog1",
       "title": "Example dataset with inputs",
       "release": "experimental",
       "streams": [
@@ -124,7 +124,7 @@
     },
     {
       "type": "logs",
-      "name": "datasources.examplelog2",
+      "dataset": "datasources.examplelog2",
       "title": "Example dataset with inputs",
       "release": "experimental",
       "streams": [
@@ -154,8 +154,8 @@
     },
     {
       "type": "metrics",
-      "name": "datasources.examplemetric",
-      "title": "Example dataset with inputs",
+      "dataset": "datasources.examplemetric",
+      "title": "Example data stream with inputs",
       "release": "experimental",
       "streams": [
         {

diff --git a/testdata/generated/package/default_pipeline/0.0.2/index.json b/testdata/generated/package/default_pipeline/0.0.2/index.json
@@ -17,12 +17,12 @@
   "assets": [
     "/package/default_pipeline/0.0.2/manifest.yml",
     "/package/default_pipeline/0.0.2/docs/README.md",
-    "/package/default_pipeline/0.0.2/dataset/foo/manifest.yml",
-    "/package/default_pipeline/0.0.2/dataset/foo/fields/base-fields.yml",
-    "/package/default_pipeline/0.0.2/dataset/foo/agent/stream/stream.yml.hbs",
-    "/package/default_pipeline/0.0.2/dataset/foo/elasticsearch/ingest_pipeline/default.json"
+    "/package/default_pipeline/0.0.2/data_stream/foo/manifest.yml",
+    "/package/default_pipeline/0.0.2/data_stream/foo/fields/base-fields.yml",
+    "/package/default_pipeline/0.0.2/data_stream/foo/agent/stream/stream.yml.hbs",
+    "/package/default_pipeline/0.0.2/data_stream/foo/elasticsearch/ingest_pipeline/default.json"
   ],
-  "config_templates": [
+  "policy_templates": [
     {
       "name": "logs",
       "title": "Logs datasource",
@@ -35,10 +35,10 @@
       "multiple": true
     }
   ],
-  "datasets": [
+  "data_streams": [
     {
       "type": "logs",
-      "name": "default_pipeline.foo",
+      "dataset": "default_pipeline.foo",
       "title": "Foo",
       "release": "experimental",
       "ingest_pipeline": "default",

diff --git a/testdata/generated/package/ecs_style_dataset/0.0.1/index.json b/testdata/generated/package/ecs_style_dataset/0.0.1/index.json
@@ -16,10 +16,10 @@
   "assets": [
     "/package/ecs_style_dataset/0.0.1/manifest.yml",
     "/package/ecs_style_dataset/0.0.1/docs/README.md",
-    "/package/ecs_style_dataset/0.0.1/dataset/foo/manifest.yml",
-    "/package/ecs_style_dataset/0.0.1/dataset/foo/fields/fields.yml"
+    "/package/ecs_style_dataset/0.0.1/data_stream/foo/manifest.yml",
+    "/package/ecs_style_dataset/0.0.1/data_stream/foo/fields/fields.yml"
   ],
-  "config_templates": [
+  "policy_templates": [
     {
       "name": "logs",
       "title": "Logs datasource",
@@ -32,10 +32,10 @@
       "multiple": true
     }
   ],
-  "datasets": [
+  "data_streams": [
     {
       "type": "logs",
-      "name": "ecs_style_dataset.foo",
+      "dataset": "ecs_style_dataset.foo",
       "title": "Foo",
       "release": "experimental",
       "package": "ecs_style_dataset",

diff --git a/testdata/generated/package/example/1.0.0/index.json b/testdata/generated/package/example/1.0.0/index.json
@@ -31,23 +31,23 @@
     "/package/example/1.0.0/docs/README.md",
     "/package/example/1.0.0/img/icon.png",
     "/package/example/1.0.0/img/kibana-envoyproxy.jpg",
-    "/package/example/1.0.0/dataset/foo/manifest.yml",
+    "/package/example/1.0.0/data_stream/foo/manifest.yml",
     "/package/example/1.0.0/kibana/dashboard/0c610510-5cbd-11e9-8477-077ec9664dbd.json",
     "/package/example/1.0.0/kibana/visualization/0a994af0-5c9d-11e9-8477-077ec9664dbd.json",
     "/package/example/1.0.0/kibana/visualization/36f872a0-5c03-11e9-85b4-19d0072eb4f2.json",
     "/package/example/1.0.0/kibana/visualization/38f96190-5c99-11e9-8477-077ec9664dbd.json",
     "/package/example/1.0.0/kibana/visualization/7e4084e0-5c99-11e9-8477-077ec9664dbd.json",
     "/package/example/1.0.0/kibana/visualization/80844540-5c97-11e9-8477-077ec9664dbd.json",
     "/package/example/1.0.0/kibana/visualization/ab48c3f0-5ca6-11e9-8477-077ec9664dbd.json",
-    "/package/example/1.0.0/dataset/foo/fields/base-fields.yml",
-    "/package/example/1.0.0/dataset/foo/agent/stream/stream.yml.hbs",
-    "/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-entry.json",
-    "/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-http.json",
-    "/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-json.json",
-    "/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-plaintext.json",
-    "/package/example/1.0.0/dataset/foo/elasticsearch/ingest_pipeline/pipeline-tcp.json"
+    "/package/example/1.0.0/data_stream/foo/fields/base-fields.yml",
+    "/package/example/1.0.0/data_stream/foo/agent/stream/stream.yml.hbs",
+    "/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-entry.json",
+    "/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-http.json",
+    "/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-json.json",
+    "/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-plaintext.json",
+    "/package/example/1.0.0/data_stream/foo/elasticsearch/ingest_pipeline/pipeline-tcp.json"
   ],
-  "config_templates": [
+  "policy_templates": [
     {
       "name": "logs",
       "title": "Logs datasource",
@@ -60,10 +60,10 @@
       "multiple": true
     }
   ],
-  "datasets": [
+  "data_streams": [
     {
       "type": "logs",
-      "name": "bar.noo",
+      "dataset": "example.foo",
       "title": "Foo",
       "release": "experimental",
       "ingest_pipeline": "pipeline-entry",

diff --git a/testdata/generated/package/multiple_false/0.0.1/index.json b/testdata/generated/package/multiple_false/0.0.1/index.json
@@ -16,12 +16,12 @@
   "assets": [
     "/package/multiple_false/0.0.1/manifest.yml",
     "/package/multiple_false/0.0.1/docs/README.md",
-    "/package/multiple_false/0.0.1/dataset/foo/manifest.yml",
-    "/package/multiple_false/0.0.1/dataset/foo/fields/base-fields.yml",
-    "/package/multiple_false/0.0.1/dataset/foo/agent/stream/stream.yml.hbs",
-    "/package/multiple_false/0.0.1/dataset/foo/elasticsearch/ingest_pipeline/default.json"
+    "/package/multiple_false/0.0.1/data_stream/foo/manifest.yml",
+    "/package/multiple_false/0.0.1/data_stream/foo/fields/base-fields.yml",
+    "/package/multiple_false/0.0.1/data_stream/foo/agent/stream/stream.yml.hbs",
+    "/package/multiple_false/0.0.1/data_stream/foo/elasticsearch/ingest_pipeline/default.json"
   ],
-  "config_templates": [
+  "policy_templates": [
     {
       "name": "logs",
       "title": "Logs datasource",
@@ -34,10 +34,10 @@
       "multiple": false
     }
   ],
-  "datasets": [
+  "data_streams": [
     {
       "type": "logs",
-      "name": "multiple_false.foo",
+      "dataset": "multiple_false.foo",
       "title": "Foo",
       "release": "experimental",
       "ingest_pipeline": "default",

diff --git a/testdata/generated/package/no_stream_configs/1.0.0/index.json b/testdata/generated/package/no_stream_configs/1.0.0/index.json
@@ -16,14 +16,14 @@
   "assets": [
     "/package/no_stream_configs/1.0.0/manifest.yml",
     "/package/no_stream_configs/1.0.0/docs/README.md",
-    "/package/no_stream_configs/1.0.0/dataset/log/manifest.yml",
-    "/package/no_stream_configs/1.0.0/dataset/log/fields/base-fields.yml",
-    "/package/no_stream_configs/1.0.0/dataset/log/fields/ecs.yml"
+    "/package/no_stream_configs/1.0.0/data_stream/log/manifest.yml",
+    "/package/no_stream_configs/1.0.0/data_stream/log/fields/base-fields.yml",
+    "/package/no_stream_configs/1.0.0/data_stream/log/fields/ecs.yml"
   ],
-  "datasets": [
+  "data_streams": [
     {
       "type": "logs",
-      "name": "no_stream_configs.log",
+      "dataset": "no_stream_configs.log",
       "title": "Log Yaml pipeline",
       "release": "experimental",
       "package": "no_stream_configs",

diff --git a/testdata/generated/package/reference/1.0.0/index.json b/testdata/generated/package/reference/1.0.0/index.json
@@ -30,10 +30,10 @@
     "/package/reference/1.0.0/manifest.yml",
     "/package/reference/1.0.0/docs/README.md",
     "/package/reference/1.0.0/img/icon.svg",
-    "/package/reference/1.0.0/dataset/reference/manifest.yml",
-    "/package/reference/1.0.0/dataset/reference/fields/base-fields.yml"
+    "/package/reference/1.0.0/data_stream/reference/manifest.yml",
+    "/package/reference/1.0.0/data_stream/reference/fields/base-fields.yml"
   ],
-  "config_templates": [
+  "policy_templates": [
     {
       "name": "nginx",
       "title": "Nginx logs and metrics.",
@@ -62,10 +62,10 @@
       "multiple": true
     }
   ],
-  "datasets": [
+  "data_streams": [
     {
       "type": "logs",
-      "name": "reference.reference",
+      "dataset": "reference.reference",
       "title": "Reference Logs Title",
       "release": "beta",
       "streams": [

diff --git a/testdata/generated/package/yamlpipeline/1.0.0/index.json b/testdata/generated/package/yamlpipeline/1.0.0/index.json
@@ -16,17 +16,17 @@
   "assets": [
     "/package/yamlpipeline/1.0.0/manifest.yml",
     "/package/yamlpipeline/1.0.0/docs/README.md",
-    "/package/yamlpipeline/1.0.0/dataset/log/manifest.yml",
-    "/package/yamlpipeline/1.0.0/dataset/log/fields/base-fields.yml",
-    "/package/yamlpipeline/1.0.0/dataset/log/agent/stream/stream.yml.hbs",
-    "/package/yamlpipeline/1.0.0/dataset/log/elasticsearch/ingest_pipeline/pipeline-entry.yml",
-    "/package/yamlpipeline/1.0.0/dataset/log/elasticsearch/ingest_pipeline/pipeline-json.yml",
-    "/package/yamlpipeline/1.0.0/dataset/log/elasticsearch/ingest_pipeline/pipeline-plaintext.yml"
+    "/package/yamlpipeline/1.0.0/data_stream/log/manifest.yml",
+    "/package/yamlpipeline/1.0.0/data_stream/log/fields/base-fields.yml",
+    "/package/yamlpipeline/1.0.0/data_stream/log/agent/stream/stream.yml.hbs",
+    "/package/yamlpipeline/1.0.0/data_stream/log/elasticsearch/ingest_pipeline/pipeline-entry.yml",
+    "/package/yamlpipeline/1.0.0/data_stream/log/elasticsearch/ingest_pipeline/pipeline-json.yml",
+    "/package/yamlpipeline/1.0.0/data_stream/log/elasticsearch/ingest_pipeline/pipeline-plaintext.yml"
   ],
-  "datasets": [
+  "data_streams": [
     {
       "type": "logs",
-      "name": "yamlpipeline.log",
+      "dataset": "yamlpipeline.log",
       "title": "Log Yaml pipeline",
       "release": "experimental",
       "ingest_pipeline": "pipeline-entry",

diff --git a/...dataset/examplelog1/agent/stream/logs.yml → ..._stream/examplelog1/agent/stream/logs.yml b/...dataset/examplelog1/agent/stream/logs.yml → ..._stream/examplelog1/agent/stream/logs.yml
diff --git a/...taset/examplelog1/agent/stream/syslog.yml → ...tream/examplelog1/agent/stream/syslog.yml b/...taset/examplelog1/agent/stream/syslog.yml → ...tream/examplelog1/agent/stream/syslog.yml
diff --git a/...ataset/examplelog1/fields/base-fields.yml → ...stream/examplelog1/fields/base-fields.yml b/...ataset/examplelog1/fields/base-fields.yml → ...stream/examplelog1/fields/base-fields.yml
diff --git a/...es/1.0.0/dataset/examplelog1/manifest.yml → ....0.0/data_stream/examplelog1/manifest.yml b/...es/1.0.0/dataset/examplelog1/manifest.yml → ....0.0/data_stream/examplelog1/manifest.yml
diff --git a/...t/examplelog2/agent/stream/stream.yml.hbs → ...m/examplelog2/agent/stream/stream.yml.hbs b/...t/examplelog2/agent/stream/stream.yml.hbs → ...m/examplelog2/agent/stream/stream.yml.hbs
diff --git a/...ataset/examplelog2/fields/base-fields.yml → ...stream/examplelog2/fields/base-fields.yml b/...ataset/examplelog2/fields/base-fields.yml → ...stream/examplelog2/fields/base-fields.yml
diff --git a/...es/1.0.0/dataset/examplelog2/manifest.yml → ....0.0/data_stream/examplelog2/manifest.yml b/...es/1.0.0/dataset/examplelog2/manifest.yml → ....0.0/data_stream/examplelog2/manifest.yml
diff --git a/...examplemetric/agent/stream/stream.yml.hbs → ...examplemetric/agent/stream/stream.yml.hbs b/...examplemetric/agent/stream/stream.yml.hbs → ...examplemetric/agent/stream/stream.yml.hbs
diff --git a/...aset/examplemetric/fields/base-fields.yml → ...ream/examplemetric/fields/base-fields.yml b/...aset/examplemetric/fields/base-fields.yml → ...ream/examplemetric/fields/base-fields.yml
diff --git a/.../1.0.0/dataset/examplemetric/manifest.yml → ....0/data_stream/examplemetric/manifest.yml b/.../1.0.0/dataset/examplemetric/manifest.yml → ....0/data_stream/examplemetric/manifest.yml
@@ -1,4 +1,4 @@
-title: Example dataset with inputs
+title: Example data stream with inputs
 type: metrics
 
 streams:

diff --git a/testdata/package/datasources/1.0.0/manifest.yml b/testdata/package/datasources/1.0.0/manifest.yml
@@ -9,7 +9,7 @@ type: integration
 license: basic
 release: beta
 
-config_templates:
+policy_templates:
   -
     # Do we need a name for the data source?
     name: nginx

diff --git a/...2/dataset/foo/agent/stream/stream.yml.hbs → ...ta_stream/foo/agent/stream/stream.yml.hbs b/...2/dataset/foo/agent/stream/stream.yml.hbs → ...ta_stream/foo/agent/stream/stream.yml.hbs
diff --git a/...lasticsearch/ingest_pipeline/default.json → ...lasticsearch/ingest_pipeline/default.json b/...lasticsearch/ingest_pipeline/default.json → ...lasticsearch/ingest_pipeline/default.json
diff --git a/.../0.0.2/dataset/foo/fields/base-fields.yml → ....2/data_stream/foo/fields/base-fields.yml b/.../0.0.2/dataset/foo/fields/base-fields.yml → ....2/data_stream/foo/fields/base-fields.yml
diff --git a/...t_pipeline/0.0.2/dataset/foo/manifest.yml → ...peline/0.0.2/data_stream/foo/manifest.yml b/...t_pipeline/0.0.2/dataset/foo/manifest.yml → ...peline/0.0.2/data_stream/foo/manifest.yml
diff --git a/testdata/package/default_pipeline/0.0.2/manifest.yml b/testdata/package/default_pipeline/0.0.2/manifest.yml
@@ -9,7 +9,7 @@ type: integration
 release: beta
 
 
-config_templates:
+policy_templates:
   - name: logs
     title: Logs datasource
     description: Datasource for your log files.

diff --git a/...taset/0.0.1/dataset/foo/fields/fields.yml → ...t/0.0.1/data_stream/foo/fields/fields.yml b/...taset/0.0.1/dataset/foo/fields/fields.yml → ...t/0.0.1/data_stream/foo/fields/fields.yml
diff --git a/...le_dataset/0.0.1/dataset/foo/manifest.yml → ...ataset/0.0.1/data_stream/foo/manifest.yml b/...le_dataset/0.0.1/dataset/foo/manifest.yml → ...ataset/0.0.1/data_stream/foo/manifest.yml
diff --git a/testdata/package/ecs_style_dataset/0.0.1/manifest.yml b/testdata/package/ecs_style_dataset/0.0.1/manifest.yml
@@ -8,7 +8,7 @@ categories: ["monitoring"]
 type: integration
 release: beta
 
-config_templates:
+policy_templates:
   - name: logs
     title: Logs datasource
     description: Datasource for your log files.

diff --git a/...0/dataset/foo/agent/stream/stream.yml.hbs → ...ta_stream/foo/agent/stream/stream.yml.hbs b/...0/dataset/foo/agent/stream/stream.yml.hbs → ...ta_stream/foo/agent/stream/stream.yml.hbs
diff --git a/...earch/ingest_pipeline/pipeline-entry.json → ...earch/ingest_pipeline/pipeline-entry.json b/...earch/ingest_pipeline/pipeline-entry.json → ...earch/ingest_pipeline/pipeline-entry.json
diff --git a/...search/ingest_pipeline/pipeline-http.json → ...search/ingest_pipeline/pipeline-http.json b/...search/ingest_pipeline/pipeline-http.json → ...search/ingest_pipeline/pipeline-http.json
diff --git a/...search/ingest_pipeline/pipeline-json.json → ...search/ingest_pipeline/pipeline-json.json b/...search/ingest_pipeline/pipeline-json.json → ...search/ingest_pipeline/pipeline-json.json
diff --git a/...h/ingest_pipeline/pipeline-plaintext.json → ...h/ingest_pipeline/pipeline-plaintext.json b/...h/ingest_pipeline/pipeline-plaintext.json → ...h/ingest_pipeline/pipeline-plaintext.json
diff --git a/...csearch/ingest_pipeline/pipeline-tcp.json → ...csearch/ingest_pipeline/pipeline-tcp.json b/...csearch/ingest_pipeline/pipeline-tcp.json → ...csearch/ingest_pipeline/pipeline-tcp.json
diff --git a/.../1.0.0/dataset/foo/fields/base-fields.yml → ....0/data_stream/foo/fields/base-fields.yml b/.../1.0.0/dataset/foo/fields/base-fields.yml → ....0/data_stream/foo/fields/base-fields.yml
diff --git a/...ge/example/1.0.0/dataset/foo/manifest.yml → ...xample/1.0.0/data_stream/foo/manifest.yml b/...ge/example/1.0.0/dataset/foo/manifest.yml → ...xample/1.0.0/data_stream/foo/manifest.yml