[Fleet] Fix source mode synthetics when handling experimental datastr…

…eam features (elastic#210195)
banderror · Feb 10, 2025 · d2070ca · d2070ca
1 parent ff5e4fa
commit d2070ca
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/...ns/shared/fleet/server/services/package_policies/experimental_datastream_features.test.ts b/...ns/shared/fleet/server/services/package_policies/experimental_datastream_features.test.ts
@@ -271,7 +271,11 @@ describe('experimental_datastream_features', () => {
         expect.objectContaining({
           body: expect.objectContaining({
             template: expect.objectContaining({
-              mappings: expect.objectContaining({ _source: { mode: 'synthetic' } }),
+              settings: expect.objectContaining({
+                index: expect.objectContaining({
+                  mapping: expect.objectContaining({ source: { mode: 'synthetic' } }),
+                }),
+              }),
             }),
           }),
           _meta: { has_experimental_data_stream_indexing_features: true },
@@ -483,7 +487,11 @@ describe('experimental_datastream_features', () => {
           expect.objectContaining({
             body: expect.objectContaining({
               template: expect.objectContaining({
-                mappings: expect.objectContaining({ _source: { mode: 'synthetic' } }),
+                settings: expect.objectContaining({
+                  index: expect.objectContaining({
+                    mapping: expect.objectContaining({ source: { mode: 'synthetic' } }),
+                  }),
+                }),
               }),
             }),
             _meta: { has_experimental_data_stream_indexing_features: true },

diff --git a/...plugins/shared/fleet/server/services/package_policies/experimental_datastream_features.ts b/...plugins/shared/fleet/server/services/package_policies/experimental_datastream_features.ts
@@ -155,21 +155,32 @@ export async function handleExperimentalDatastreamFeatureOptIn({
     });
 
     if (isSyntheticSourceOptInChanged) {
-      sourceModeSettings = {
-        _source: {
-          ...(featureMapEntry.features.synthetic_source ? { mode: 'synthetic' } : {}),
-        },
-      };
+      sourceModeSettings = featureMapEntry.features.synthetic_source
+        ? {
+            source: {
+              mode: 'synthetic',
+            },
+          }
+        : {};
     }
 
     if (componentTemplateChanged) {
       const body = {
         template: {
           ...componentTemplate.template,
+          settings: {
+            ...componentTemplate.template?.settings,
+            index: {
+              ...componentTemplate.template?.settings?.index,
+              mapping: {
+                ...componentTemplate.template?.settings?.index?.mapping,
+                ...sourceModeSettings,
+              },
+            },
+          },
           mappings: {
             ...mappings,
             properties: mappingsProperties ?? {},
-            ...sourceModeSettings,
           },
         },
       };