[8.16] [ResponseOps][Actions] Allow to delete connectors with unsupported connector type using the API (#208033) (#208658)

# Backport This will backport the following commits from `main` to `8.16`: - [[ResponseOps][Actions] Allow to delete connectors with unsupported connector type using the API (#208033)](https://github.com/elastic/kibana/pull/208033)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Antonio <antonio.coelho@elastic.co>
2025-04-24 09:48:58 -04:00 · 2025-01-29 13:23:25 +11:00 · 2025-01-29 13:23:25 +11:00 · 3512420dbf
commit 3512420dbf
parent 2599c82f58
4 changed files with 98 additions and 3 deletions
--- a/x-pack/plugins/actions/server/actions_client/actions_client.test.ts
+++ b/x-pack/plugins/actions/server/actions_client/actions_client.test.ts
@ -2170,6 +2170,39 @@ describe('delete()', () => {
      `"System action system-connector-.cases is not allowed to delete."`
    );
  });
+
+  test('deleting unregistered action types works as expected', async () => {
+    const expectedResult = Symbol();
+    unsecuredSavedObjectsClient.delete.mockResolvedValueOnce(expectedResult);
+    unsecuredSavedObjectsClient.get = jest.fn().mockResolvedValueOnce({
+      id: '2',
+      type: 'action',
+      attributes: {
+        actionTypeId: 'unregistered-action-type-id',
+        isMissingSecrets: false,
+        config: {},
+        secrets: {},
+      },
+      references: [],
+    });
+
+    const result = await actionsClient.delete({ id: '2' });
+    expect(result).toEqual(expectedResult);
+
+    // the event is logged but no error is thrown as expected
+    expect(logger.error).toHaveBeenCalledWith(
+      `Failed fetching action type from registry: Action type \"unregistered-action-type-id\" is not registered. - deletion will proceed.`
+    );
+
+    // deletion is called with the right params
+    expect(unsecuredSavedObjectsClient.delete).toHaveBeenCalledTimes(1);
+    expect(unsecuredSavedObjectsClient.delete.mock.calls[0]).toMatchInlineSnapshot(`
+      Array [
+        "action",
+        "2",
+      ]
+    `);
+  });
 });

 describe('update()', () => {
--- a/x-pack/plugins/actions/server/actions_client/actions_client.ts
+++ b/x-pack/plugins/actions/server/actions_client/actions_client.ts
@ -43,6 +43,7 @@ import {
  ActionTypeExecutorResult,
  ConnectorTokenClientContract,
  HookServices,
+  ActionType,
 } from '../types';
 import { PreconfiguredActionDisabledModificationError } from '../lib/errors/preconfigured_action_disabled_modification';
 import {
@ -460,14 +461,22 @@ export class ActionsClient {
      attributes: { actionTypeId, config },
    } = rawAction;

-    const actionType = this.context.actionTypeRegistry.get(actionTypeId);
+    let actionType: ActionType | undefined;
+    try {
+      actionType = this.context.actionTypeRegistry.get(actionTypeId);
+    } catch (e) {
+      this.context.logger.error(
+        `Failed fetching action type from registry: ${e.message} - deletion will proceed.`
+      );
+    }
+
    const result = await this.context.unsecuredSavedObjectsClient.delete('action', id);

    const hookServices: HookServices = {
      scopedClusterClient: this.context.scopedClusterClient,
    };

-    if (actionType.postDeleteHook) {
+    if (actionType && actionType.postDeleteHook) {
      try {
        await actionType.postDeleteHook({
          connectorId: id,
--- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/delete.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/delete.ts
@ -9,7 +9,7 @@ import { v4 as uuidv4 } from 'uuid';
 import expect from '@kbn/expect';
 import { ESTestIndexTool, ES_TEST_INDEX_NAME } from '@kbn/alerting-api-integration-helpers';

-import { UserAtSpaceScenarios } from '../../../scenarios';
+import { UserAtSpaceScenarios, SuperuserAtSpace1 } from '../../../scenarios';
 import { getUrlPrefix, ObjectRemover } from '../../../../common/lib';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';

@ -19,6 +19,8 @@ export default function deleteActionTests({ getService }: FtrProviderContext) {
  const supertestWithoutAuth = getService('supertestWithoutAuth');
  const es = getService('es');
  const retry = getService('retry');
+  const kibanaServer = getService('kibanaServer');
+
  const esTestIndexTool = new ESTestIndexTool(es, retry);

  describe('delete', () => {
@ -28,6 +30,7 @@ export default function deleteActionTests({ getService }: FtrProviderContext) {
      await esTestIndexTool.destroy();
      await esTestIndexTool.setup();
    });
+
    after(async () => {
      await esTestIndexTool.destroy();
      await objectRemover.removeAll();
@ -297,5 +300,35 @@ export default function deleteActionTests({ getService }: FtrProviderContext) {
        });
      });
    }
+
+    it('should delete a connector with an unsupported type', async () => {
+      await kibanaServer.importExport.load(
+        'x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/fixtures/unsupported_connector_type.json'
+      );
+
+      const { space, user } = SuperuserAtSpace1;
+      const { body: createdConnector } = await supertest
+        .post(`${getUrlPrefix(space.id)}/api/actions/connector`)
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'My Connector',
+          connector_type_id: 'test.index-record',
+          config: {
+            unencrypted: `This value shouldn't get encrypted`,
+          },
+          secrets: {
+            encrypted: 'This value should be encrypted',
+          },
+        })
+        .expect(200);
+
+      const response = await supertestWithoutAuth
+        .delete(`${getUrlPrefix(space.id)}/api/actions/connector/${createdConnector.id}`)
+        .auth(user.username, user.password)
+        .set('kbn-xsrf', 'foo');
+
+      expect(response.statusCode).to.eql(204);
+      expect(response.body).to.eql('');
+    });
  });
 }
--- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/fixtures/unsupported_connector_type.json
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/fixtures/unsupported_connector_type.json
@ -0,0 +1,20 @@
+{
+    "attributes": {
+        "actionTypeId": ".invalid-type",
+        "config": {
+            "apiUrl": "https://localhost:5601/"
+        },
+        "isMissingSecrets": true,
+        "name": "Invalid connector",
+        "secrets": {}
+    },
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2025-01-28T08:46:46.614Z",
+    "id": "e6dca811-c3c1-4eca-8eb0-54c792c0b662",
+    "managed": false,
+    "references": [],
+    "type": "action",
+    "typeMigrationVersion": "10.1.0",
+    "updated_at": "2025-01-28T08:46:46.614Z",
+    "version": "WzUsMl0="
+}