[Fleet] Connect fleet to policy change update

x-pack/legacy/plugins/fleet/index.ts

@@ -57,11 +57,13 @@ export function fleet(kibana: any) {
     config: () => config,
     configPrefix: CONFIG_PREFIX,
     init(server: any) {
-      server.newPlatform.setup.plugins.encryptedSavedObjects.registerType({
-        type: 'enrollment_api_keys',
-        attributesToEncrypt: new Set(['api_key']),
-        attributesToExcludeFromAAD: new Set(['enrollment_rules']),
-      });
+      // TODO https://github.com/elastic/kibana/issues/53199
+      // server.newPlatform.setup.plugins.encryptedSavedObjects.registerType({
+      //   type: 'enrollment_api_keys',
+      //   // attributesToEncrypt: new Set(['api_key']),
+      //   attributesToEncrypt: new Set([]),
+      //   attributesToExcludeFromAAD: new Set(['enrollment_rules']),
+      // });
       server.plugins.xpack_main.registerFeature({
         id: 'fleet',
         name: 'Fleet',

x-pack/legacy/plugins/fleet/public/pages/agent_list/components/agent_enrollment.tsx

@@ -131,7 +131,7 @@ export const AgentEnrollmentFlyout: React.FC<RouterProps> = ({ onClose, policies
       {apiKeyListVisible && (
         <>
           <EuiSpacer size="m" />
-          <EnrollmentApiKeysTable />
+          <EnrollmentApiKeysTable onChange={() => enrollmentApiKeys.refresh()} />
         </>
       )}
     </>

x-pack/legacy/plugins/fleet/public/pages/agent_list/components/enrollment_api_keys/index.tsx

@@ -12,10 +12,11 @@ import { useLibs, usePagination } from '../../../../hooks';
 import { useEnrollmentApiKeys, useEnrollmentApiKey } from './hooks';
 import { ConfirmDeleteModal } from './confirm_delete_modal';
 import { CreateApiKeyForm } from './create_api_key_form';
-
 export { useEnrollmentApiKeys, useEnrollmentApiKey } from './hooks';
 
-export const EnrollmentApiKeysTable: React.FC = () => {
+export const EnrollmentApiKeysTable: React.FC<{
+  onChange: () => void;
+}> = ({ onChange }) => {
   const { enrollmentApiKeys } = useLibs();
   const [confirmDeleteApiKeyId, setConfirmDeleteApiKeyId] = useState<string | null>(null);
   const { pagination } = usePagination();
@@ -81,7 +82,12 @@ export const EnrollmentApiKeysTable: React.FC = () => {
         columns={columns}
       />
       <EuiSpacer size={'s'} />
-      <CreateApiKeyButton onChange={() => refresh()} />
+      <CreateApiKeyButton
+        onChange={() => {
+          refresh();
+          onChange();
+        }}
+      />
     </>
   );
 };

x-pack/legacy/plugins/fleet/server/kibana.index.ts

@@ -6,32 +6,8 @@
 
 import { compose } from './libs/compose/kibana';
 import { initRestApi } from './routes/init_api';
-import { FrameworkUser } from './adapters/framework/adapter_types';
-import { PolicyUpdatedEvent } from '../common/types/domain_data';
 
 export const initServerWithKibana = (hapiServer: any) => {
   const libs = compose(hapiServer);
   initRestApi(hapiServer, libs);
-  // expose methods
-  libs.framework.expose('policyUpdated', async function handlePolicyUpdate(
-    event: PolicyUpdatedEvent,
-    user: FrameworkUser = {
-      kind: 'internal',
-    }
-  ) {
-    if (event.type === 'created') {
-      await libs.apiKeys.generateEnrollmentApiKey(user, {
-        policyId: event.policyId,
-      });
-    }
-
-    if (event.type === 'updated') {
-      await libs.agentsPolicy.updateAgentsForPolicyId(user, event.policyId);
-    }
-
-    if (event.type === 'deleted') {
-      await libs.agents.unenrollForPolicy(user, event.policyId);
-      await libs.apiKeys.deleteEnrollmentApiKeyForPolicyId(user, event.policyId);
-    }
-  });
 };

x-pack/legacy/plugins/fleet/server/libs/compose/kibana.ts

@@ -24,6 +24,7 @@ import { InstallLib } from '../install';
 import { ElasticsearchAdapter } from '../../adapters/elasticsearch/default';
 import { AgentPolicyLib } from '../agent_policy';
 import { AgentEventLib } from '../agent_event';
+import { makePolicyUpdateHandler } from '../policy_update';
 
 export function compose(server: any): FleetServerLib {
   const frameworkAdapter = new FrameworkAdapter(server);
@@ -59,7 +60,7 @@ export function compose(server: any): FleetServerLib {
 
   const install = new InstallLib(framework);
 
-  return {
+  const libs = {
     agents,
     agentsPolicy,
     agentEvents,
@@ -69,4 +70,8 @@ export function compose(server: any): FleetServerLib {
     install,
     framework,
   };
+  const policyUpdateHandler = makePolicyUpdateHandler(libs);
+  server.plugins.ingest.policy.registerPolicyUpdateHandler(policyUpdateHandler);
+
+  return libs;
 }

x-pack/legacy/plugins/fleet/server/libs/policy_update.ts

@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FrameworkUser } from '../adapters/framework/adapter_types';
+import { FleetServerLib } from './types';
+
+export function makePolicyUpdateHandler(libs: FleetServerLib) {
+  return async function policyUpdateHandler(user: FrameworkUser, action: string, policyId: string) {
+    const internalUser = libs.framework.getInternalUser();
+
+    if (action === 'created') {
+      if (policyId === 'default') {
+        // TODO wait for #53111 to be fixed
+        return;
+      }
+      await libs.apiKeys.generateEnrollmentApiKey(internalUser, {
+        policyId,
+      });
+    }
+
+    if (action === 'updated') {
+      await libs.agentsPolicy.updateAgentsForPolicyId(internalUser, policyId);
+    }
+
+    if (action === 'deleted') {
+      await libs.agents.unenrollForPolicy(internalUser, policyId);
+      await libs.apiKeys.deleteEnrollmentApiKeyForPolicyId(internalUser, policyId);
+    }
+  };
+}