Remove config flag

elastic · Jun 2, 2021 · 082b71c · 082b71c
1 parent 1d07565
commit 082b71c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 20 deletions.
diff --git a/x-pack/plugins/fleet/common/types/index.ts b/x-pack/plugins/fleet/common/types/index.ts
@@ -22,7 +22,6 @@ export interface FleetConfigType {
     fleet_server?: {
       hosts?: string[];
     };
-    agentPolicyTightPermissions: boolean;
   };
   agentPolicies?: PreconfiguredAgentPolicy[];
   packages?: PreconfiguredPackage[];

diff --git a/x-pack/plugins/fleet/public/applications/fleet/mock/plugin_configuration.ts b/x-pack/plugins/fleet/public/applications/fleet/mock/plugin_configuration.ts
@@ -18,7 +18,6 @@ export const createConfigurationMock = (): FleetConfigType => {
         host: '',
         ca_sha256: '',
       },
-      agentPolicyTightPermissions: false,
     },
   };
 };
diff --git a/x-pack/plugins/fleet/server/index.ts b/x-pack/plugins/fleet/server/index.ts
@@ -57,7 +57,6 @@ export const config: PluginConfigDescriptor = {
           hosts: schema.maybe(schema.arrayOf(schema.uri({ scheme: ['http', 'https'] }))),
         })
       ),
-      agentPolicyTightPermissions: schema.boolean({ defaultValue: false }),
     }),
     packages: PreconfiguredPackagesSchema,
     agentPolicies: PreconfiguredAgentPoliciesSchema,

diff --git a/x-pack/plugins/fleet/server/mocks/index.ts b/x-pack/plugins/fleet/server/mocks/index.ts
@@ -31,7 +31,7 @@ export const createAppContextStartContractMock = (): FleetAppContext => {
     logger: loggingSystemMock.create().get(),
     isProductionMode: true,
     configInitialValue: {
-      agents: { enabled: true, elasticsearch: {}, agentPolicyTightPermissions: true },
+      agents: { enabled: true, elasticsearch: {} },
       enabled: true,
     },
     kibanaVersion: '8.0.0',

diff --git a/x-pack/plugins/fleet/server/services/agent_policy.ts b/x-pack/plugins/fleet/server/services/agent_policy.ts
@@ -750,23 +750,14 @@ class AgentPolicyService {
           }),
     };
 
-    const hasTightPermissions = appContextService.getConfig()?.agents.agentPolicyTightPermissions;
-    let permissions: FullAgentPolicyOutputPermissions;
-
-    if (hasTightPermissions) {
-      permissions = (await storedPackagePoliciesToAgentPermissions(
-        soClient,
-        agentPolicy.package_policies
-      )) || { _fallback: DEFAULT_PERMISSIONS };
+    const permissions = (await storedPackagePoliciesToAgentPermissions(
+      soClient,
+      agentPolicy.package_policies
+    )) || { _fallback: DEFAULT_PERMISSIONS };
 
-      permissions._elastic_agent_checks = {
-        cluster: DEFAULT_PERMISSIONS.cluster,
-      };
-    } else {
-      permissions = {
-        _fallback: DEFAULT_PERMISSIONS,
-      };
-    }
+    permissions._elastic_agent_checks = {
+      cluster: DEFAULT_PERMISSIONS.cluster,
+    };
 
     // Only add permissions if output.type is "elasticsearch"
     fullAgentPolicy.output_permissions = Object.keys(fullAgentPolicy.outputs).reduce<