Whitelist full agent config output fields

elastic · Mar 4, 2020 · 01d1c61 · 01d1c61
1 parent 8e9ae8c
commit 01d1c61
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts b/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
@@ -50,7 +50,7 @@ export type FullAgentConfigDatasource = Pick<Datasource, 'name' | 'namespace' |
 export interface FullAgentConfig {
   id: string;
   outputs: {
-    [key: string]: Omit<Output, 'is_default' | 'config' | 'name' | 'id'> & {
+    [key: string]: Pick<Output, 'type' | 'hosts' | 'ca_sha256' | 'api_key'> & {
       [key: string]: any;
     };
   };

diff --git a/x-pack/plugins/ingest_manager/server/services/agent_config.ts b/x-pack/plugins/ingest_manager/server/services/agent_config.ts
@@ -302,20 +302,22 @@ class AgentConfigService {
       return null;
     }
 
-    const agentConfig = {
+    const agentConfig: FullAgentConfig = {
       id: config.id,
       outputs: {
         // TEMPORARY as we only support a default output
         ...[
           await outputService.get(soClient, await outputService.getDefaultOutputId(soClient)),
-        ].reduce((outputs, { config: outputConfig, is_default, name, id: outputId, ...output }) => {
+        ].reduce((outputs, { config: outputConfig, name, type, hosts, ca_sha256, api_key }) => {
           outputs[name] = {
-            ...output,
-            type: output.type as any,
+            type,
+            hosts,
+            ca_sha256,
+            api_key,
             ...outputConfig,
           };
           return outputs;
-        }, {} as any),
+        }, {} as FullAgentConfig['outputs']),
       },
       datasources: (config.datasources as Datasource[]).map(ds =>
         this.storedDatasourceToAgentDatasource(ds)