From 5e23a620ae16c18b0432c3c44c6fba3245bb3c3e Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 12 Oct 2023 12:18:34 +0200 Subject: [PATCH] [apache_tomcat] Quote keys with dots in test config files (#8174) Fix tests of apache_tomcat package by quoting the keys with dots in the test configuration files. They were failing because new checks were merged around the same time. --- packages/apache_tomcat/_dev/deploy/docker/variants.yml | 4 ++-- .../access/_dev/test/pipeline/test-common-config.yml | 2 +- .../cache/_dev/test/pipeline/test-common-config.yml | 2 +- .../catalina/_dev/test/pipeline/test-common-config.yml | 5 ++--- .../_dev/test/pipeline/test-common-config.yml | 2 +- .../localhost/_dev/test/pipeline/test-common-config.yml | 5 ++--- .../memory/_dev/test/pipeline/test-common-config.yml | 2 +- .../request/_dev/test/pipeline/test-common-config.yml | 2 +- .../session/_dev/test/pipeline/test-common-config.yml | 2 +- .../thread_pool/_dev/test/pipeline/test-common-config.yml | 2 +- packages/apache_tomcat/validation.yml | 2 +- 11 files changed, 14 insertions(+), 16 deletions(-) diff --git a/packages/apache_tomcat/_dev/deploy/docker/variants.yml b/packages/apache_tomcat/_dev/deploy/docker/variants.yml index 02693f62f6..fd99a25dd0 100644 --- a/packages/apache_tomcat/_dev/deploy/docker/variants.yml +++ b/packages/apache_tomcat/_dev/deploy/docker/variants.yml @@ -1,4 +1,4 @@ variants: - v10.1.5: + "v10.1.5": TOMCAT_VERSION: 10.1.5 -default: v10.1.5 +default: "v10.1.5" diff --git a/packages/apache_tomcat/data_stream/access/_dev/test/pipeline/test-common-config.yml b/packages/apache_tomcat/data_stream/access/_dev/test/pipeline/test-common-config.yml index 5622947e4b..a06dda7405 100644 --- a/packages/apache_tomcat/data_stream/access/_dev/test/pipeline/test-common-config.yml +++ b/packages/apache_tomcat/data_stream/access/_dev/test/pipeline/test-common-config.yml @@ -1,5 +1,5 @@ dynamic_fields: - event.ingested: ".*" + "event.ingested": ".*" fields: tags: - preserve_original_event diff --git a/packages/apache_tomcat/data_stream/cache/_dev/test/pipeline/test-common-config.yml b/packages/apache_tomcat/data_stream/cache/_dev/test/pipeline/test-common-config.yml index c39dc38617..e071d397dd 100644 --- a/packages/apache_tomcat/data_stream/cache/_dev/test/pipeline/test-common-config.yml +++ b/packages/apache_tomcat/data_stream/cache/_dev/test/pipeline/test-common-config.yml @@ -1,2 +1,2 @@ dynamic_fields: - event.ingested: ".*" + "event.ingested": ".*" diff --git a/packages/apache_tomcat/data_stream/catalina/_dev/test/pipeline/test-common-config.yml b/packages/apache_tomcat/data_stream/catalina/_dev/test/pipeline/test-common-config.yml index 79b8da5167..b53b86eec1 100644 --- a/packages/apache_tomcat/data_stream/catalina/_dev/test/pipeline/test-common-config.yml +++ b/packages/apache_tomcat/data_stream/catalina/_dev/test/pipeline/test-common-config.yml @@ -1,8 +1,7 @@ dynamic_fields: - event.ingested: '.*' + "event.ingested": '.*' fields: - _conf: - tz_offset: UTC + "_conf.tz_offset": UTC tags: - preserve_original_event multiline: diff --git a/packages/apache_tomcat/data_stream/connection_pool/_dev/test/pipeline/test-common-config.yml b/packages/apache_tomcat/data_stream/connection_pool/_dev/test/pipeline/test-common-config.yml index c39dc38617..e071d397dd 100644 --- a/packages/apache_tomcat/data_stream/connection_pool/_dev/test/pipeline/test-common-config.yml +++ b/packages/apache_tomcat/data_stream/connection_pool/_dev/test/pipeline/test-common-config.yml @@ -1,2 +1,2 @@ dynamic_fields: - event.ingested: ".*" + "event.ingested": ".*" diff --git a/packages/apache_tomcat/data_stream/localhost/_dev/test/pipeline/test-common-config.yml b/packages/apache_tomcat/data_stream/localhost/_dev/test/pipeline/test-common-config.yml index 79b8da5167..b53b86eec1 100644 --- a/packages/apache_tomcat/data_stream/localhost/_dev/test/pipeline/test-common-config.yml +++ b/packages/apache_tomcat/data_stream/localhost/_dev/test/pipeline/test-common-config.yml @@ -1,8 +1,7 @@ dynamic_fields: - event.ingested: '.*' + "event.ingested": '.*' fields: - _conf: - tz_offset: UTC + "_conf.tz_offset": UTC tags: - preserve_original_event multiline: diff --git a/packages/apache_tomcat/data_stream/memory/_dev/test/pipeline/test-common-config.yml b/packages/apache_tomcat/data_stream/memory/_dev/test/pipeline/test-common-config.yml index c39dc38617..e071d397dd 100644 --- a/packages/apache_tomcat/data_stream/memory/_dev/test/pipeline/test-common-config.yml +++ b/packages/apache_tomcat/data_stream/memory/_dev/test/pipeline/test-common-config.yml @@ -1,2 +1,2 @@ dynamic_fields: - event.ingested: ".*" + "event.ingested": ".*" diff --git a/packages/apache_tomcat/data_stream/request/_dev/test/pipeline/test-common-config.yml b/packages/apache_tomcat/data_stream/request/_dev/test/pipeline/test-common-config.yml index c39dc38617..e071d397dd 100644 --- a/packages/apache_tomcat/data_stream/request/_dev/test/pipeline/test-common-config.yml +++ b/packages/apache_tomcat/data_stream/request/_dev/test/pipeline/test-common-config.yml @@ -1,2 +1,2 @@ dynamic_fields: - event.ingested: ".*" + "event.ingested": ".*" diff --git a/packages/apache_tomcat/data_stream/session/_dev/test/pipeline/test-common-config.yml b/packages/apache_tomcat/data_stream/session/_dev/test/pipeline/test-common-config.yml index c39dc38617..e071d397dd 100644 --- a/packages/apache_tomcat/data_stream/session/_dev/test/pipeline/test-common-config.yml +++ b/packages/apache_tomcat/data_stream/session/_dev/test/pipeline/test-common-config.yml @@ -1,2 +1,2 @@ dynamic_fields: - event.ingested: ".*" + "event.ingested": ".*" diff --git a/packages/apache_tomcat/data_stream/thread_pool/_dev/test/pipeline/test-common-config.yml b/packages/apache_tomcat/data_stream/thread_pool/_dev/test/pipeline/test-common-config.yml index c39dc38617..e071d397dd 100644 --- a/packages/apache_tomcat/data_stream/thread_pool/_dev/test/pipeline/test-common-config.yml +++ b/packages/apache_tomcat/data_stream/thread_pool/_dev/test/pipeline/test-common-config.yml @@ -1,2 +1,2 @@ dynamic_fields: - event.ingested: ".*" + "event.ingested": ".*" diff --git a/packages/apache_tomcat/validation.yml b/packages/apache_tomcat/validation.yml index 31fb4dc011..1189aa63c8 100644 --- a/packages/apache_tomcat/validation.yml +++ b/packages/apache_tomcat/validation.yml @@ -1,3 +1,3 @@ errors: exclude_checks: - - SVR00004 # References in dashboards. \ No newline at end of file + - SVR00004 # References in dashboards.