[Index Management] Fix get data streams api integration (#71067)

* fix get all data streams api integration test * fix and skip api integration with ES for fetching one data stream * update types * fix types issue * unskip tests Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elastic · Jul 9, 2020 · b25b690 · b25b690
1 parent a5bbbf9
commit b25b690
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/home/data_streams_tab.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/home/data_streams_tab.helpers.ts
@@ -166,7 +166,7 @@ export const setup = async (overridingDependencies: any = {}): Promise<DataStrea
 
 export const createDataStreamPayload = (name: string): DataStream => ({
   name,
-  timeStampField: { name: '@timestamp', mapping: { type: 'date' } },
+  timeStampField: { name: '@timestamp' },
   indices: [
     {
       name: 'indexName',

diff --git a/x-pack/plugins/index_management/common/types/data_streams.ts b/x-pack/plugins/index_management/common/types/data_streams.ts
@@ -6,9 +6,6 @@
 
 interface TimestampFieldFromEs {
   name: string;
-  mapping: {
-    type: string;
-  };
 }
 
 type TimestampField = TimestampFieldFromEs;

diff --git a/x-pack/plugins/index_management/server/routes/api/data_streams/register_get_route.ts b/x-pack/plugins/index_management/server/routes/api/data_streams/register_get_route.ts
@@ -17,7 +17,9 @@ export function registerGetAllRoute({ router, license, lib: { isEsError } }: Rou
       const { callAsCurrentUser } = ctx.dataManagement!.client;
 
       try {
-        const dataStreams = await callAsCurrentUser('dataManagement.getDataStreams');
+        const { data_streams: dataStreams } = await callAsCurrentUser(
+          'dataManagement.getDataStreams'
+        );
         const body = deserializeDataStreamList(dataStreams);
 
         return res.ok({ body });
@@ -50,7 +52,10 @@ export function registerGetOneRoute({ router, license, lib: { isEsError } }: Rou
       const { callAsCurrentUser } = ctx.dataManagement!.client;
 
       try {
-        const dataStream = await callAsCurrentUser('dataManagement.getDataStream', { name });
+        const { data_streams: dataStream } = await callAsCurrentUser(
+          'dataManagement.getDataStream',
+          { name }
+        );
 
         if (dataStream[0]) {
           const body = deserializeDataStream(dataStream[0]);

diff --git a/x-pack/test/api_integration/apis/management/index_management/data_streams.ts b/x-pack/test/api_integration/apis/management/index_management/data_streams.ts
@@ -53,8 +53,7 @@ export default function ({ getService }: FtrProviderContext) {
     await deleteComposableIndexTemplate(name);
   };
 
-  // Failing ES Promotion: https://github.com/elastic/kibana/issues/71018
-  describe.skip('Data streams', function () {
+  describe('Data streams', function () {
     describe('Get', () => {
       const testDataStreamName = 'test-data-stream';
 
@@ -72,7 +71,7 @@ export default function ({ getService }: FtrProviderContext) {
         expect(dataStreams).to.eql([
           {
             name: testDataStreamName,
-            timeStampField: { name: '@timestamp', mapping: { type: 'date' } },
+            timeStampField: { name: '@timestamp' },
             indices: [
               {
                 name: indexName,
@@ -94,7 +93,7 @@ export default function ({ getService }: FtrProviderContext) {
         const { name: indexName, uuid } = dataStream.indices[0];
         expect(dataStream).to.eql({
           name: testDataStreamName,
-          timeStampField: { name: '@timestamp', mapping: { type: 'date' } },
+          timeStampField: { name: '@timestamp' },
           indices: [
             {
               name: indexName,