From 6e278bc2363b557e169fb6168867f5568314cec1 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Wed, 5 Aug 2020 09:57:31 +0200 Subject: [PATCH] Rename fields data stream (#622) * Rename datastream to data_stream * Bump up version * Update CHANGELOG * Fix * Fix * Fix descriptions * Fix --- CHANGELOG.md | 10 ++++++++-- main.go | 2 +- testdata/generated/index.json | 2 +- .../1.0.0/dataset/examplelog1/fields/base-fields.yml | 12 ++++++------ .../1.0.0/dataset/examplelog2/fields/base-fields.yml | 12 ++++++------ .../dataset/examplemetric/fields/base-fields.yml | 12 ++++++------ .../0.0.2/dataset/foo/fields/base-fields.yml | 12 ++++++------ .../0.0.1/dataset/foo/fields/fields.yml | 10 +++++----- .../example/1.0.0/dataset/foo/fields/base-fields.yml | 12 ++++++------ .../0.0.1/dataset/foo/fields/base-fields.yml | 12 ++++++------ .../1.0.0/dataset/log/fields/base-fields.yml | 12 ++++++------ .../1.0.0/dataset/reference/fields/base-fields.yml | 12 ++++++------ .../1.0.0/dataset/log/fields/base-fields.yml | 12 ++++++------ util/dataset.go | 6 +++--- 14 files changed, 72 insertions(+), 66 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad250fa17..331eee24f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/elastic/package-registry/compare/v0.9.0...master) +## [Unreleased](https://github.com/elastic/package-registry/compare/v0.10.0...master) ### Breaking changes @@ -16,7 +16,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Known Issue -## [v0.9.0](https://github.com/elastic/package-registry/compare/v0.8.0...0.9.0) +## [v0.10.0](https://github.com/elastic/package-registry/compare/v0.9.0...v0.10.0) + +### Breaking changes + +* Change dataset.* fields to data_stream.* fields. [#622](https://github.com/elastic/package-registry/pull/622) + +## [v0.9.0](https://github.com/elastic/package-registry/compare/v0.8.0...v0.9.0) ### Breaking changes diff --git a/main.go b/main.go index db7332b52..2d509a4fb 100644 --- a/main.go +++ b/main.go @@ -29,7 +29,7 @@ const ( packageDir = "package" serviceName = "package-registry" - version = "0.9.0" + version = "0.10.0" ) var ( diff --git a/testdata/generated/index.json b/testdata/generated/index.json index 6a979a6ca..805c6c739 100644 --- a/testdata/generated/index.json +++ b/testdata/generated/index.json @@ -1,4 +1,4 @@ { "service.name": "package-registry", - "version": "0.9.0" + "version": "0.10.0" } \ No newline at end of file diff --git a/testdata/package/datasources/1.0.0/dataset/examplelog1/fields/base-fields.yml b/testdata/package/datasources/1.0.0/dataset/examplelog1/fields/base-fields.yml index bb0c4e9cb..c40df14f9 100644 --- a/testdata/package/datasources/1.0.0/dataset/examplelog1/fields/base-fields.yml +++ b/testdata/package/datasources/1.0.0/dataset/examplelog1/fields/base-fields.yml @@ -1,15 +1,15 @@ -- name: datastream.type +- name: data_stream.type type: constant_keyword description: > - Datastream type. -- name: datastream.dataset + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Datastream dataset. -- name: datastream.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Datastream namespace. + Data stream namespace. - name: "@timestamp" type: date description: > diff --git a/testdata/package/datasources/1.0.0/dataset/examplelog2/fields/base-fields.yml b/testdata/package/datasources/1.0.0/dataset/examplelog2/fields/base-fields.yml index bb0c4e9cb..c40df14f9 100644 --- a/testdata/package/datasources/1.0.0/dataset/examplelog2/fields/base-fields.yml +++ b/testdata/package/datasources/1.0.0/dataset/examplelog2/fields/base-fields.yml @@ -1,15 +1,15 @@ -- name: datastream.type +- name: data_stream.type type: constant_keyword description: > - Datastream type. -- name: datastream.dataset + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Datastream dataset. -- name: datastream.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Datastream namespace. + Data stream namespace. - name: "@timestamp" type: date description: > diff --git a/testdata/package/datasources/1.0.0/dataset/examplemetric/fields/base-fields.yml b/testdata/package/datasources/1.0.0/dataset/examplemetric/fields/base-fields.yml index bb0c4e9cb..c40df14f9 100644 --- a/testdata/package/datasources/1.0.0/dataset/examplemetric/fields/base-fields.yml +++ b/testdata/package/datasources/1.0.0/dataset/examplemetric/fields/base-fields.yml @@ -1,15 +1,15 @@ -- name: datastream.type +- name: data_stream.type type: constant_keyword description: > - Datastream type. -- name: datastream.dataset + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Datastream dataset. -- name: datastream.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Datastream namespace. + Data stream namespace. - name: "@timestamp" type: date description: > diff --git a/testdata/package/default_pipeline/0.0.2/dataset/foo/fields/base-fields.yml b/testdata/package/default_pipeline/0.0.2/dataset/foo/fields/base-fields.yml index bb0c4e9cb..c40df14f9 100644 --- a/testdata/package/default_pipeline/0.0.2/dataset/foo/fields/base-fields.yml +++ b/testdata/package/default_pipeline/0.0.2/dataset/foo/fields/base-fields.yml @@ -1,15 +1,15 @@ -- name: datastream.type +- name: data_stream.type type: constant_keyword description: > - Datastream type. -- name: datastream.dataset + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Datastream dataset. -- name: datastream.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Datastream namespace. + Data stream namespace. - name: "@timestamp" type: date description: > diff --git a/testdata/package/ecs_style_dataset/0.0.1/dataset/foo/fields/fields.yml b/testdata/package/ecs_style_dataset/0.0.1/dataset/foo/fields/fields.yml index 3f9d1f4fa..29d8cbfb1 100644 --- a/testdata/package/ecs_style_dataset/0.0.1/dataset/foo/fields/fields.yml +++ b/testdata/package/ecs_style_dataset/0.0.1/dataset/foo/fields/fields.yml @@ -3,8 +3,8 @@ description: > Event timestamp. -- name: datastream - title: datastream +- name: data_stream + title: data_stream group: 2 description: Fields describing the new indexing strategy -- type: group @@ -12,15 +12,15 @@ - name: dataset level: custom type: constant_keyword - description: Datastream dataset. + description: Data stream dataset. default_field: false - name: namespace level: custom type: constant_keyword - description: Datastream namespace. + description: Data stream namespace. default_field: false - name: type level: custom type: constant_keyword - description: Datastream type. + description: Data stream type. default_field: false diff --git a/testdata/package/example/1.0.0/dataset/foo/fields/base-fields.yml b/testdata/package/example/1.0.0/dataset/foo/fields/base-fields.yml index bb0c4e9cb..c40df14f9 100644 --- a/testdata/package/example/1.0.0/dataset/foo/fields/base-fields.yml +++ b/testdata/package/example/1.0.0/dataset/foo/fields/base-fields.yml @@ -1,15 +1,15 @@ -- name: datastream.type +- name: data_stream.type type: constant_keyword description: > - Datastream type. -- name: datastream.dataset + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Datastream dataset. -- name: datastream.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Datastream namespace. + Data stream namespace. - name: "@timestamp" type: date description: > diff --git a/testdata/package/multiple_false/0.0.1/dataset/foo/fields/base-fields.yml b/testdata/package/multiple_false/0.0.1/dataset/foo/fields/base-fields.yml index bb0c4e9cb..c40df14f9 100644 --- a/testdata/package/multiple_false/0.0.1/dataset/foo/fields/base-fields.yml +++ b/testdata/package/multiple_false/0.0.1/dataset/foo/fields/base-fields.yml @@ -1,15 +1,15 @@ -- name: datastream.type +- name: data_stream.type type: constant_keyword description: > - Datastream type. -- name: datastream.dataset + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Datastream dataset. -- name: datastream.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Datastream namespace. + Data stream namespace. - name: "@timestamp" type: date description: > diff --git a/testdata/package/no_stream_configs/1.0.0/dataset/log/fields/base-fields.yml b/testdata/package/no_stream_configs/1.0.0/dataset/log/fields/base-fields.yml index bb0c4e9cb..c40df14f9 100644 --- a/testdata/package/no_stream_configs/1.0.0/dataset/log/fields/base-fields.yml +++ b/testdata/package/no_stream_configs/1.0.0/dataset/log/fields/base-fields.yml @@ -1,15 +1,15 @@ -- name: datastream.type +- name: data_stream.type type: constant_keyword description: > - Datastream type. -- name: datastream.dataset + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Datastream dataset. -- name: datastream.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Datastream namespace. + Data stream namespace. - name: "@timestamp" type: date description: > diff --git a/testdata/package/reference/1.0.0/dataset/reference/fields/base-fields.yml b/testdata/package/reference/1.0.0/dataset/reference/fields/base-fields.yml index bb0c4e9cb..c40df14f9 100644 --- a/testdata/package/reference/1.0.0/dataset/reference/fields/base-fields.yml +++ b/testdata/package/reference/1.0.0/dataset/reference/fields/base-fields.yml @@ -1,15 +1,15 @@ -- name: datastream.type +- name: data_stream.type type: constant_keyword description: > - Datastream type. -- name: datastream.dataset + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Datastream dataset. -- name: datastream.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Datastream namespace. + Data stream namespace. - name: "@timestamp" type: date description: > diff --git a/testdata/package/yamlpipeline/1.0.0/dataset/log/fields/base-fields.yml b/testdata/package/yamlpipeline/1.0.0/dataset/log/fields/base-fields.yml index bb0c4e9cb..c40df14f9 100644 --- a/testdata/package/yamlpipeline/1.0.0/dataset/log/fields/base-fields.yml +++ b/testdata/package/yamlpipeline/1.0.0/dataset/log/fields/base-fields.yml @@ -1,15 +1,15 @@ -- name: datastream.type +- name: data_stream.type type: constant_keyword description: > - Datastream type. -- name: datastream.dataset + Data stream type. +- name: data_stream.dataset type: constant_keyword description: > - Datastream dataset. -- name: datastream.namespace + Data stream dataset. +- name: data_stream.namespace type: constant_keyword description: > - Datastream namespace. + Data stream namespace. - name: "@timestamp" type: date description: > diff --git a/util/dataset.go b/util/dataset.go index f28f0e390..a98f2808e 100644 --- a/util/dataset.go +++ b/util/dataset.go @@ -305,9 +305,9 @@ func (d *Dataset) validateRequiredFields() error { } // Verify required keys - err = requireField(allFields, "datastream.type", "constant_keyword", err) - err = requireField(allFields, "datastream.dataset", "constant_keyword", err) - err = requireField(allFields, "datastream.namespace", "constant_keyword", err) + err = requireField(allFields, "data_stream.type", "constant_keyword", err) + err = requireField(allFields, "data_stream.dataset", "constant_keyword", err) + err = requireField(allFields, "data_stream.namespace", "constant_keyword", err) err = requireField(allFields, "@timestamp", "date", err) return err }