From 2e0eaf0670194c7d19a0b7259a78401d1838263a Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Thu, 25 Jun 2020 14:06:15 -0700
Subject: [PATCH] Fix type issues

---
 .../services/validate_datasource.test.ts      | 24 +++++++++----------
 .../server/services/datasource.test.ts        | 10 ++++----
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/services/validate_datasource.test.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/services/validate_datasource.test.ts
index b5e3677ba8f671..64facf01d474a7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/services/validate_datasource.test.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/services/validate_datasource.test.ts
@@ -158,7 +158,7 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'foo-foo',
-            dataset: { name: 'foo' },
+            dataset: { name: 'foo', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: 'test_yaml: value', type: 'yaml' } },
           },
@@ -174,13 +174,13 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'bar-bar',
-            dataset: { name: 'bar' },
+            dataset: { name: 'bar', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: 'test_yaml: value', type: 'yaml' } },
           },
           {
             id: 'bar-bar2',
-            dataset: { name: 'bar2' },
+            dataset: { name: 'bar2', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: undefined, type: 'text' } },
           },
@@ -197,13 +197,13 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'with-disabled-streams-disabled',
-            dataset: { name: 'disabled' },
+            dataset: { name: 'disabled', type: 'logs' },
             enabled: false,
             vars: { 'var-name': { value: undefined, type: 'text' } },
           },
           {
             id: 'with-disabled-streams-disabled-without-vars',
-            dataset: { name: 'disabled2' },
+            dataset: { name: 'disabled2', type: 'logs' },
             enabled: false,
           },
         ],
@@ -217,7 +217,7 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'with-no-stream-vars-bar',
-            dataset: { name: 'bar' },
+            dataset: { name: 'bar', type: 'logs' },
             enabled: true,
           },
         ],
@@ -240,7 +240,7 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'foo-foo',
-            dataset: { name: 'foo' },
+            dataset: { name: 'foo', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: 'invalidyaml: test\n foo bar:', type: 'yaml' } },
           },
@@ -256,13 +256,13 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'bar-bar',
-            dataset: { name: 'bar' },
+            dataset: { name: 'bar', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: '    \n\n', type: 'yaml' } },
           },
           {
             id: 'bar-bar2',
-            dataset: { name: 'bar2' },
+            dataset: { name: 'bar2', type: 'logs' },
             enabled: true,
             vars: { 'var-name': { value: undefined, type: 'text' } },
           },
@@ -279,7 +279,7 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'with-disabled-streams-disabled',
-            dataset: { name: 'disabled' },
+            dataset: { name: 'disabled', type: 'logs' },
             enabled: false,
             vars: {
               'var-name': {
@@ -290,7 +290,7 @@ describe('Ingest Manager - validateDatasource()', () => {
           },
           {
             id: 'with-disabled-streams-disabled-without-vars',
-            dataset: { name: 'disabled2' },
+            dataset: { name: 'disabled2', type: 'logs' },
             enabled: false,
           },
         ],
@@ -304,7 +304,7 @@ describe('Ingest Manager - validateDatasource()', () => {
         streams: [
           {
             id: 'with-no-stream-vars-bar',
-            dataset: { name: 'bar' },
+            dataset: { name: 'bar', type: 'logs' },
             enabled: true,
           },
         ],
diff --git a/x-pack/plugins/ingest_manager/server/services/datasource.test.ts b/x-pack/plugins/ingest_manager/server/services/datasource.test.ts
index e12b3e39511357..8d98e41c8ae690 100644
--- a/x-pack/plugins/ingest_manager/server/services/datasource.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/datasource.test.ts
@@ -44,6 +44,7 @@ describe('Datasource service', () => {
         ({
           datasets: [
             {
+              type: 'logs',
               name: 'package.dataset1',
               streams: [{ input: 'log', template_path: 'some_template_path.yml' }],
             },
@@ -61,7 +62,7 @@ describe('Datasource service', () => {
             streams: [
               {
                 id: 'dataset01',
-                dataset: { name: 'package.dataset1' },
+                dataset: { name: 'package.dataset1', type: 'logs' },
                 enabled: true,
                 vars: {
                   paths: {
@@ -81,7 +82,7 @@ describe('Datasource service', () => {
           streams: [
             {
               id: 'dataset01',
-              dataset: { name: 'package.dataset1' },
+              dataset: { name: 'package.dataset1', type: 'logs' },
               enabled: true,
               vars: {
                 paths: {
@@ -105,6 +106,7 @@ describe('Datasource service', () => {
           datasets: [
             {
               name: 'package.dataset1',
+              type: 'logs',
               streams: [{ input: 'log', template_path: 'some_template_path.yml' }],
             },
           ],
@@ -126,7 +128,7 @@ describe('Datasource service', () => {
             streams: [
               {
                 id: 'dataset01',
-                dataset: { name: 'package.dataset1' },
+                dataset: { name: 'package.dataset1', type: 'logs' },
                 enabled: true,
               },
             ],
@@ -146,7 +148,7 @@ describe('Datasource service', () => {
           streams: [
             {
               id: 'dataset01',
-              dataset: { name: 'package.dataset1' },
+              dataset: { name: 'package.dataset1', type: 'logs' },
               enabled: true,
               agent_stream: {
                 metricset: ['dataset1'],