From 4f9b0e3a93c862eeabf59836d21e5b527647e543 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 26 Jul 2024 17:16:14 +0000 Subject: [PATCH] Wrap CreateIndexRequest mappings in _doc key as required (#809) * Wrap CreateIndexRequest mappings in _doc key as required Signed-off-by: Daniel Widdis * Add changelog/release notes Signed-off-by: Daniel Widdis --------- Signed-off-by: Daniel Widdis (cherry picked from commit 834903f082e33eeea7360206745b5e2eaa160744) Signed-off-by: github-actions[bot] --- CHANGELOG.md | 1 + .../opensearch-flow-framework.release-notes-2.16.0.0.md | 1 + .../flowframework/indices/FlowFrameworkIndicesHandler.java | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a53c2f68..35a77adb0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) ### Bug Fixes - Handle Not Found exceptions as successful deletions for agents and models ([#805](https://github.com/opensearch-project/flow-framework/pull/805)) +- Wrap CreateIndexRequest mappings in _doc key as required ([#809](https://github.com/opensearch-project/flow-framework/pull/809)) ### Infrastructure ### Documentation diff --git a/release-notes/opensearch-flow-framework.release-notes-2.16.0.0.md b/release-notes/opensearch-flow-framework.release-notes-2.16.0.0.md index a4cd2157c..388dba240 100644 --- a/release-notes/opensearch-flow-framework.release-notes-2.16.0.0.md +++ b/release-notes/opensearch-flow-framework.release-notes-2.16.0.0.md @@ -10,3 +10,4 @@ Compatible with OpenSearch 2.16.0 ### Bug Fixes - Handle Not Found deprovision exceptions as successful deletions ([#805](https://github.com/opensearch-project/flow-framework/pull/805)) +- Wrap CreateIndexRequest mappings in _doc key as required ([#809](https://github.com/opensearch-project/flow-framework/pull/809)) diff --git a/src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java b/src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java index 18f0a9780..43c00d230 100644 --- a/src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java +++ b/src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java @@ -193,7 +193,8 @@ public void initFlowFrameworkIndexIfAbsent(FlowFrameworkIndex index, ActionListe logger.error(errorMessage, e); internalListener.onFailure(new FlowFrameworkException(errorMessage, ExceptionsHelper.status(e))); }); - CreateIndexRequest request = new CreateIndexRequest(indexName).mapping(mapping).settings(indexSettings); + CreateIndexRequest request = new CreateIndexRequest(indexName).mapping("{\"_doc\":" + mapping + "}") + .settings(indexSettings); client.admin().indices().create(request, actionListener); } else { logger.debug("index: {} is already created", indexName);