From 520b485f62c0706e0db6456786a227c43471ce31 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 19 May 2022 17:44:35 +0200 Subject: [PATCH] Re-enable validation of duplicated fields --- code/go/internal/validator/spec.go | 3 +-- code/go/pkg/validator/validator_test.go | 1 - versions/1/changelog.yml | 6 +++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/go/internal/validator/spec.go b/code/go/internal/validator/spec.go index 2d7cb526a..d0e33a79b 100644 --- a/code/go/internal/validator/spec.go +++ b/code/go/internal/validator/spec.go @@ -72,8 +72,7 @@ func (s Spec) ValidatePackage(pkg Package) ve.ValidationErrors { semantic.ValidatePrerelease, semantic.ValidateFieldGroups, semantic.ValidateFieldsLimits(rootSpec.Limits.FieldsPerDataStreamLimit), - // Temporarily disabled: https://github.com/elastic/package-spec/issues/331 - //semantic.ValidateUniqueFields, + semantic.ValidateUniqueFields, semantic.ValidateDimensionFields, semantic.ValidateRequiredFields, } diff --git a/code/go/pkg/validator/validator_test.go b/code/go/pkg/validator/validator_test.go index d108804b9..87c4c99bd 100644 --- a/code/go/pkg/validator/validator_test.go +++ b/code/go/pkg/validator/validator_test.go @@ -272,7 +272,6 @@ func TestValidateVersionIntegrity(t *testing.T) { } func TestValidateDuplicatedFields(t *testing.T) { - t.Skip("Validation temporarily disabled: https://github.com/elastic/package-spec/issues/331") tests := map[string]string{ "bad_duplicated_fields": "field \"event.dataset\" is defined multiple times for data stream \"wrong\", found in: ../../../../test/packages/bad_duplicated_fields/data_stream/wrong/fields/base-fields.yml, ../../../../test/packages/bad_duplicated_fields/data_stream/wrong/fields/ecs.yml", } diff --git a/versions/1/changelog.yml b/versions/1/changelog.yml index ec2f2374a..7f1baac2c 100644 --- a/versions/1/changelog.yml +++ b/versions/1/changelog.yml @@ -4,9 +4,9 @@ ## - version: 1.9.1-next changes: - - description: Prepare for next version - type: enhancement - link: https://github.com/elastic/package-spec/pull/? + - description: Enable validation of duplicated fields. + type: enhancement + link: https://github.com/elastic/package-spec/pull/338 - version: 1.9.0 changes: - description: Prepare for next version