fix tests

x-pack/solutions/observability/plugins/streams/server/lib/streams/stream_crud.ts

@@ -20,6 +20,8 @@ import {
   StreamLifecycle,
   ReadStreamDefinition,
   IngestReadStreamDefinition,
+  isWiredReadStream,
+  WiredReadStreamDefinition,
 } from '@kbn/streams-schema';
 import { omit } from 'lodash';
 import { STREAMS_INDEX } from '../../../common/constants';
@@ -172,7 +174,7 @@ async function upsertInternalStream({
   return scopedClusterClient.asInternalUser.index({
     id: definition.name,
     index: STREAMS_INDEX,
-    document: { ...omit(definition, 'elasticsearch_assets', 'inherited_fields') },
+    document: { ...omit(definition, 'elasticsearch_assets', 'inherited_fields', 'lifecycle') },
     refresh: 'wait_for',
   });
 }
@@ -422,7 +424,7 @@ export async function readAncestors({
             scopedClusterClient,
             id: ancestorId,
             skipAccessCheck: true,
-          }) as unknown as WiredStreamDefinition
+          }) as unknown as WiredReadStreamDefinition
       )
     ),
   };
@@ -469,7 +471,7 @@ export async function validateAncestorFields(
     for (const name in fields) {
       if (
         Object.hasOwn(fields, name) &&
-        isWiredStream(ancestor) &&
+        isWiredReadStream(ancestor) &&
         Object.entries(ancestor.stream.ingest.wired.fields).some(
           ([ancestorFieldName, attr]) =>
             attr.type !== fields[name].type && ancestorFieldName === name
@@ -570,7 +572,7 @@ export async function syncStream({
   rootDefinition,
   logger,
 }: SyncStreamParams) {
-  if (!isWiredStream(definition)) {
+  if (!isWiredStream(definition) && !isWiredReadStream(definition)) {
     await syncUnmanagedStream({ scopedClusterClient, definition, logger, assetClient });
     await upsertInternalStream({
       scopedClusterClient,
@@ -641,9 +643,6 @@ interface ExecutionPlanStep {
 }
 
 async function syncUnmanagedStream({ scopedClusterClient, definition }: SyncStreamParams) {
-  if (isWiredStream(definition)) {
-    throw new Error('Got an unmanaged stream that is marked as managed');
-  }
   if (definition.stream.ingest.routing.length) {
     throw new Error('Unmanaged streams cannot have managed children, coming soon');
   }

x-pack/solutions/observability/plugins/streams/server/routes/streams/schema/unmapped_fields.ts

@@ -8,7 +8,7 @@
 import { z } from '@kbn/zod';
 import { internal, notFound } from '@hapi/boom';
 import { getFlattenedObject } from '@kbn/std';
-import { isWiredStream } from '@kbn/streams-schema';
+import { isWiredReadStream } from '@kbn/streams-schema';
 import { DefinitionNotFound } from '../../../lib/streams/errors';
 import { checkAccess, readAncestors, readStream } from '../../../lib/streams/stream_crud';
 import { createServerRoute } from '../../create_server_route';
@@ -71,7 +71,7 @@ export const unmappedFieldsRoute = createServerRoute({
       // Mapped fields from the stream's definition and inherited from ancestors
       const mappedFields = new Set<string>();
 
-      if (isWiredStream(streamEntity)) {
+      if (isWiredReadStream(streamEntity)) {
         Object.keys(streamEntity.stream.ingest.wired.fields).forEach((name) =>
           mappedFields.add(name)
         );

x-pack/test/api_integration/apis/streams/classic.ts

@@ -99,7 +99,11 @@ export default function ({ getService }: FtrProviderContext) {
       expect(getResponse.body).to.eql({
         name: TEST_STREAM_NAME,
         dashboards: [],
-        inherited_fields: [],
+        inherited_fields: {},
+        lifecycle: {
+          policy: 'logs',
+          type: 'ilm',
+        },
         stream: {
           ingest: {
             processing: [

x-pack/test/api_integration/apis/streams/enrichment.ts

@@ -128,9 +128,7 @@ export default function ({ getService }: FtrProviderContext) {
       expect(result._source).to.eql({
         '@timestamp': '2024-01-01T00:00:10.000Z',
         message: '2023-01-01T00:00:10.000Z error test',
-        host: {
-          name: 'routeme',
-        },
+        'host.name': 'routeme',
         inner_timestamp: '2023-01-01T00:00:10.000Z',
         message2: 'test',
         'log.level': 'error',
@@ -162,13 +160,9 @@ export default function ({ getService }: FtrProviderContext) {
         '@timestamp': '2024-01-01T00:00:11.000Z',
         message: '2023-01-01T00:00:10.000Z info mylogger this is the message',
         inner_timestamp: '2023-01-01T00:00:10.000Z',
-        host: {
-          name: 'routeme',
-        },
-        log: {
-          level: 'info',
-          logger: 'mylogger',
-        },
+        'host.name': 'routeme',
+        'log.level': 'info',
+        'log.logger': 'mylogger',
         message2: 'mylogger this is the message',
         message3: 'this is the message',
       });