From 0755dca115101dee6a5582d444d3c7d76e3c029e Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Mon, 18 Oct 2021 08:03:09 -0400
Subject: [PATCH] [Security Solution][Endpoint] Change
 `trustedAppByPolicyEnabled` flag to `true` by default (#115264)

* set `trustedAppsByPolicyEnabled` flag to true by default
* Adjust server tests
---
 .../plugins/security_solution/common/experimental_features.ts  | 2 +-
 .../server/fleet_integration/fleet_integration.test.ts         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/security_solution/common/experimental_features.ts b/x-pack/plugins/security_solution/common/experimental_features.ts
index 148390324c13f..14b1bf8dc22dd 100644
--- a/x-pack/plugins/security_solution/common/experimental_features.ts
+++ b/x-pack/plugins/security_solution/common/experimental_features.ts
@@ -16,7 +16,7 @@ export const allowedExperimentalValues = Object.freeze({
   ruleRegistryEnabled: false,
   tGridEnabled: true,
   tGridEventRenderedViewEnabled: true,
-  trustedAppsByPolicyEnabled: false,
+  trustedAppsByPolicyEnabled: true,
   excludePoliciesInFilterEnabled: false,
   uebaEnabled: false,
   disableIsolationUIPendingStatuses: false,
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts
index d0bbb3b346ea8..2f31f54143f74 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts
@@ -343,9 +343,10 @@ describe('ingest_integration tests ', () => {
       });
     });
 
-    it("doesn't remove policy from trusted app FF disabled", async () => {
+    it("doesn't remove policy from trusted app if feature flag is disabled", async () => {
       await invokeDeleteCallback({
         ...allowedExperimentalValues,
+        trustedAppsByPolicyEnabled: false, // since it was changed to `true` by default
       });
 
       expect(exceptionListClient.findExceptionListItem).toHaveBeenCalledTimes(0);