Better account for invalid yaml parsing

elastic · Mar 17, 2020 · 60dd245 · 60dd245
1 parent c18b8d9
commit 60dd245
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
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
@@ -43,6 +43,10 @@ describe('Ingest Manager - storedDatasourceToAgentDatasource', () => {
             type: 'yaml',
             value: '',
           },
+          barVar5: {
+            type: 'yaml',
+            value: 'testField: test\n invalidSpacing: foo',
+          },
         },
       },
     ],

diff --git a/x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.ts b/x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.ts
@@ -28,8 +28,13 @@ export const storedDatasourceToAgentDatasource = (
                 (acc, [configName, { type: configType, value: configValue }]) => {
                   if (configValue !== undefined) {
                     if (configType === 'yaml') {
-                      if (configValue.trim()) {
-                        acc[configName] = safeLoad(configValue);
+                      try {
+                        const yamlValue = safeLoad(configValue);
+                        if (yamlValue) {
+                          acc[configName] = yamlValue;
+                        }
+                      } catch (e) {
+                        // Silently swallow parsing error
                       }
                     } else {
                       acc[configName] = configValue;