Fix unit tests

nchaulet · nchaulet · commit 35145be7fad9 · 2020-04-14T13:40:48.000-04:00
diff --git a/x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.test.ts b/x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.test.ts
@@ -109,10 +109,6 @@ describe('Ingest Manager - storedDatasourceToAgentDatasource', () => {
         {
           type: 'test-logs',
           enabled: true,
-          inputVar: 'input-value',
-          inputVar3: {
-            testField: 'test',
-          },
           streams: [
             {
               id: 'test-logs-foo',
@@ -152,10 +148,6 @@ describe('Ingest Manager - storedDatasourceToAgentDatasource', () => {
         {
           type: 'test-logs',
           enabled: true,
-          inputVar: 'input-value',
-          inputVar3: {
-            testField: 'test',
-          },
           streams: [
             {
               id: 'test-logs-foo',
diff --git a/x-pack/plugins/ingest_manager/server/services/datasource.test.ts b/x-pack/plugins/ingest_manager/server/services/datasource.test.ts
@@ -31,11 +31,34 @@ jest.mock('./epm/packages/assets', () => {
 });
 
 describe('Datasource service', () => {
-  const pkgKey = 'package-1.0.0';
-
   describe('assignPackageStream', () => {
-    it('should work', async () => {
-      const inputs = await datasourceService.assignPackageStream(pkgKey, [
+    it('should work with cofig variables from the stream', async () => {
+      const inputs = await datasourceService.assignPackageStream(
+        {
+          pkgName: 'package',
+          pkgVersion: '1.0.0',
+        },
+        [
+          {
+            type: 'log',
+            enabled: true,
+            streams: [
+              {
+                id: 'dataset01',
+                dataset: 'package.dataset1',
+                enabled: true,
+                config: {
+                  paths: {
+                    value: ['/var/log/set.log'],
+                  },
+                },
+              },
+            ],
+          },
+        ]
+      );
+
+      expect(inputs).toEqual([
         {
           type: 'log',
           enabled: true,
@@ -49,25 +72,57 @@ describe('Datasource service', () => {
                   value: ['/var/log/set.log'],
                 },
               },
+              pkg_stream: {
+                metricset: ['dataset1'],
+                paths: ['/var/log/set.log'],
+                type: 'log',
+              },
             },
           ],
         },
       ]);
+    });
+
+    it('should work with config variables at the input level', async () => {
+      const inputs = await datasourceService.assignPackageStream(
+        {
+          pkgName: 'package',
+          pkgVersion: '1.0.0',
+        },
+        [
+          {
+            type: 'log',
+            enabled: true,
+            config: {
+              paths: {
+                value: ['/var/log/set.log'],
+              },
+            },
+            streams: [
+              {
+                id: 'dataset01',
+                dataset: 'package.dataset1',
+                enabled: true,
+              },
+            ],
+          },
+        ]
+      );
 
       expect(inputs).toEqual([
         {
           type: 'log',
           enabled: true,
+          config: {
+            paths: {
+              value: ['/var/log/set.log'],
+            },
+          },
           streams: [
             {
               id: 'dataset01',
               dataset: 'package.dataset1',
               enabled: true,
-              config: {
-                paths: {
-                  value: ['/var/log/set.log'],
-                },
-              },
               pkg_stream: {
                 metricset: ['dataset1'],
                 paths: ['/var/log/set.log'],

Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,6 @@ describe('Ingest Manager - storedDatasourceToAgentDatasource', () => {`
`109`	`109`	`{`
`110`	`110`	`type: 'test-logs',`
`111`	`111`	`enabled: true,`
`112`		`- inputVar: 'input-value',`
`113`		`- inputVar3: {`
`114`		`- testField: 'test',`
`115`		`- },`
`116`	`112`	`streams: [`
`117`	`113`	`{`
`118`	`114`	`id: 'test-logs-foo',`
`@@ -152,10 +148,6 @@ describe('Ingest Manager - storedDatasourceToAgentDatasource', () => {`
`152`	`148`	`{`
`153`	`149`	`type: 'test-logs',`
`154`	`150`	`enabled: true,`
`155`		`- inputVar: 'input-value',`
`156`		`- inputVar3: {`
`157`		`- testField: 'test',`
`158`		`- },`
`159`	`151`	`streams: [`
`160`	`152`	`{`
`161`	`153`	`id: 'test-logs-foo',`