From 709eb7dd16a96a7c4072d41b6141f075bf827ff9 Mon Sep 17 00:00:00 2001 From: Benjamin Trent Date: Tue, 5 Mar 2019 11:29:11 -0600 Subject: [PATCH 1/3] [Data-Frame] make the config be strictly parsed on _preview --- .../core/dataframe/action/PreviewDataFrameTransformAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformAction.java index 3269d5415f185..188606618011c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PreviewDataFrameTransformAction.java @@ -65,7 +65,7 @@ public static Request fromXContent(final XContentParser parser) throws IOExcepti .createParser(parser.getXContentRegistry(), LoggingDeprecationHandler.INSTANCE, BytesReference.bytes(xContentBuilder).streamInput())) { - return new Request(DataFrameTransformConfig.fromXContent(newParser, "transform-preview", true)); + return new Request(DataFrameTransformConfig.fromXContent(newParser, "transform-preview", false)); } } From 20e4789f82065e0f7c2210eb419833c84970e83f Mon Sep 17 00:00:00 2001 From: Benjamin Trent <4357155+benwtrent@users.noreply.github.com> Date: Thu, 7 Mar 2019 16:22:05 -0600 Subject: [PATCH 2/3] adding test to verify strictly parsing --- .../test/data_frame/preview_transforms.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/data_frame/preview_transforms.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/data_frame/preview_transforms.yml index 3bad56e66bd7c..f6fb793d7a5ae 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/data_frame/preview_transforms.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/data_frame/preview_transforms.yml @@ -88,3 +88,17 @@ setup: - match: { preview.2.airline: foo } - match: { preview.2.by-hour: "2017-02-49 01" } - match: { preview.2.avg_response: 42.0 } + +--- +"Test preview transform with invalid config": + - do: + catch: /\[data_frame_transform\] failed to parse field \[pivot\]/ + data_frame.preview_data_frame_transform: + body: > + { + "source": "airline-data", + "pivot": { + "group_by": {"airline": {"terms": {"not_a_terms_param": "airline"}}}, + "aggs": {"avg_response": {"avg": {"field": "responsetime"}}} + } + } From eb73449ee366eb360d80ec73fb34260c28619478 Mon Sep 17 00:00:00 2001 From: Benjamin Trent <4357155+benwtrent@users.noreply.github.com> Date: Fri, 8 Mar 2019 14:08:08 -0600 Subject: [PATCH 3/3] adjusting test after master merge --- .../rest-api-spec/test/data_frame/preview_transforms.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/data_frame/preview_transforms.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/data_frame/preview_transforms.yml index f6fb793d7a5ae..642a69e57e63f 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/data_frame/preview_transforms.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/data_frame/preview_transforms.yml @@ -92,7 +92,7 @@ setup: --- "Test preview transform with invalid config": - do: - catch: /\[data_frame_transform\] failed to parse field \[pivot\]/ + catch: /\[data_frame_terms_group\] unknown field \[not_a_terms_param\]/ data_frame.preview_data_frame_transform: body: > {