Fix bug and test

elastic · Jan 23, 2025 · 8e8d4d9 · 8e8d4d9
1 parent 494e676
commit 8e8d4d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/x-pack/platform/plugins/shared/fleet/server/services/agent_policy.ts b/x-pack/platform/plugins/shared/fleet/server/services/agent_policy.ts
@@ -221,7 +221,7 @@ class AgentPolicyService {
         soClient,
         agentPolicy,
         existingAgentPolicy,
-        getAllowedOutputTypesForAgentPolicy(existingAgentPolicy)
+        getAllowedOutputTypesForAgentPolicy({ ...existingAgentPolicy, ...agentPolicy })
       );
     }
     await soClient.update<AgentPolicySOAttributes>(savedObjectType, id, {

diff --git a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy.ts
@@ -617,12 +617,6 @@ export default function (providerContext: FtrProviderContext) {
       });
 
       it('should return 400 if setting data output to non-local ES for agentless policy', async () => {
-        const { body: fleetServerHosts } = await supertest
-          .get(`/api/fleet/fleet_server_hosts`)
-          .expect(200);
-        // eslint-disable-next-line no-console
-        console.log(fleetServerHosts);
-
         const { body: outputResponse } = await supertest
           .post(`/api/fleet/outputs`)
           .set('kbn-xsrf', 'xxxx')
@@ -1669,12 +1663,6 @@ export default function (providerContext: FtrProviderContext) {
       });
 
       it('should return 400 if updating data output to non-local ES for agentless policy', async () => {
-        const { body: fleetServerHosts } = await supertest
-          .get(`/api/fleet/fleet_server_hosts`)
-          .expect(200);
-        // eslint-disable-next-line no-console
-        console.log(fleetServerHosts);
-
         const { body: outputResponse } = await supertest
           .post(`/api/fleet/outputs`)
           .set('kbn-xsrf', 'xxxx')
@@ -1696,12 +1684,8 @@ export default function (providerContext: FtrProviderContext) {
           .send({
             name: 'test-agentless-policy',
             namespace: 'default',
-            supports_agentless: true,
-          });
-
-        // .expect(200);
-        // eslint-disable-next-line no-console
-        console.log(agentPolicyResponse);
+          })
+          .expect(200);
 
         const agentPolicy = agentPolicyResponse.body.item;
 
@@ -1711,6 +1695,7 @@ export default function (providerContext: FtrProviderContext) {
           .send({
             name: 'test-agentless-policy',
             namespace: 'default',
+            supports_agentless: true,
             data_output_id: outputResponse.item.id,
           })
           .expect(400);