Fix tests and in memory connectors bug

Author: ersin-erdal

x-pack/platform/plugins/shared/actions/server/actions_client/actions_client.test.ts

@@ -1398,12 +1398,8 @@ describe('getBulk()', () => {
       {
         id: 'testPreconfigured',
         actionTypeId: '.slack',
-        secrets: {
-          test: 'test1',
-        },
         isPreconfigured: true,
         name: 'test',
-        config: { foo: 'bar' },
       },
       {
         id: '1',
@@ -1549,20 +1545,15 @@ describe('getBulk()', () => {
     ).toContainConnectors([
       {
         actionTypeId: '.slack',
-        config: { foo: 'bar' },
         id: 'testPreconfigured',
         isPreconfigured: true,
         name: 'test',
-        secrets: {},
       },
       {
         actionTypeId: '.cases',
-        config: {},
         id: 'system-connector-.cases',
-        isMissingSecrets: false,
         isSystemAction: true,
         name: 'System action: .cases',
-        secrets: {},
       },
       {
         actionTypeId: 'test',

x-pack/platform/plugins/shared/actions/server/actions_client/actions_client.ts

@@ -80,6 +80,7 @@ import type { ConnectorCreateParams } from '../application/connector/methods/cre
 import { isPreconfigured } from '../lib/is_preconfigured';
 import { isSystemAction } from '../lib/is_system_action';
 import type { ConnectorExecuteParams } from '../application/connector/methods/execute/types';
+import { connectorFromInMemoryConnector } from '../application/connector/lib/connector_from_in_memory_connector';
 
 export interface ConstructorOptions {
   logger: Logger;
@@ -228,22 +229,28 @@ export class ActionsClient {
 
     const actionResults = new Array<ActionResult>();
 
-    for (const actionId of ids) {
-      const action = this.context.inMemoryConnectors.find(
-        (inMemoryConnector) => inMemoryConnector.id === actionId
+    for (const connectorId of ids) {
+      const inMemoryConnector = this.context.inMemoryConnectors.find(
+        (connector) => connector.id === connectorId
       );
 
-      /**
-       * Getting system connector is not allowed
-       * if throwIfSystemAction is set to true.
-       * Default behavior is to throw
-       */
-      if (action !== undefined && action.isSystemAction && throwIfSystemAction) {
-        throw Boom.notFound(`Connector ${action.id} not found`);
-      }
+      if (inMemoryConnector !== undefined) {
+        const connector = connectorFromInMemoryConnector({
+          inMemoryConnector,
+          id: connectorId,
+          actionTypeRegistry: this.context.actionTypeRegistry,
+        });
+
+        /**
+         * Getting system connector is not allowed
+         * if throwIfSystemAction is set to true.
+         * Default behavior is to throw
+         */
+        if (connector.isSystemAction && throwIfSystemAction) {
+          throw Boom.notFound(`Connector ${connector.id} not found`);
+        }
 
-      if (action !== undefined) {
-        actionResults.push(action);
+        actionResults.push(connector);
       }
     }
 

x-pack/platform/plugins/shared/actions/server/application/connector/lib/connector_from_in_memory_connector.ts

@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ActionTypeRegistry } from '../../../action_type_registry';
+import type { InMemoryConnector } from '../../../types';
+import type { Connector } from '../types';
+import { isConnectorDeprecated } from './is_connector_deprecated';
+
+export function connectorFromInMemoryConnector({
+  id,
+  inMemoryConnector,
+  actionTypeRegistry,
+}: {
+  id: string;
+  inMemoryConnector: InMemoryConnector;
+  actionTypeRegistry: ActionTypeRegistry;
+}): Connector {
+  const connector: Connector = {
+    id,
+    actionTypeId: inMemoryConnector.actionTypeId,
+    name: inMemoryConnector.name,
+    isPreconfigured: inMemoryConnector.isPreconfigured,
+    isSystemAction: inMemoryConnector.isSystemAction,
+    isDeprecated: isConnectorDeprecated(inMemoryConnector),
+    isConnectorTypeDeprecated: actionTypeRegistry.isDeprecated(inMemoryConnector.actionTypeId),
+  };
+
+  if (inMemoryConnector.exposeConfig) {
+    connector.config = inMemoryConnector.config;
+  }
+  return connector;
+}

x-pack/platform/plugins/shared/actions/server/application/connector/methods/get/get.ts

@@ -12,6 +12,7 @@ import type { Connector } from '../../types';
 import { ConnectorAuditAction, connectorAuditEvent } from '../../../../lib/audit_events';
 import { isConnectorDeprecated } from '../../lib';
 import type { GetParams } from './types';
+import { connectorFromInMemoryConnector } from '../../lib/connector_from_in_memory_connector';
 
 export async function get({
   context,
@@ -59,21 +60,11 @@ export async function get({
       })
     );
 
-    connector = {
+    connector = connectorFromInMemoryConnector({
       id,
-      actionTypeId: foundInMemoryConnector.actionTypeId,
-      name: foundInMemoryConnector.name,
-      isPreconfigured: foundInMemoryConnector.isPreconfigured,
-      isSystemAction: foundInMemoryConnector.isSystemAction,
-      isDeprecated: isConnectorDeprecated(foundInMemoryConnector),
-      isConnectorTypeDeprecated: actionTypeRegistry.isDeprecated(
-        foundInMemoryConnector.actionTypeId
-      ),
-    };
-
-    if (foundInMemoryConnector.exposeConfig) {
-      connector.config = foundInMemoryConnector.config;
-    }
+      inMemoryConnector: foundInMemoryConnector,
+      actionTypeRegistry,
+    });
   } else {
     const result = await getConnectorSo({
       unsecuredSavedObjectsClient: context.unsecuredSavedObjectsClient,

x-pack/platform/plugins/shared/actions/server/application/connector/methods/list_types/list_types.test.ts

@@ -115,6 +115,7 @@ describe('listTypes()', () => {
         enabledInLicense: true,
         supportedFeatureIds: ['alerting'],
         isSystemActionType: false,
+        isDeprecated: false,
       },
     ]);
   });
@@ -172,6 +173,7 @@ describe('listTypes()', () => {
         enabledInLicense: true,
         supportedFeatureIds: ['alerting'],
         isSystemActionType: false,
+        isDeprecated: false,
       },
       {
         id: 'my-action-type-2',
@@ -182,6 +184,7 @@ describe('listTypes()', () => {
         enabled: true,
         enabledInConfig: true,
         enabledInLicense: true,
+        isDeprecated: false,
       },
     ]);
   });
@@ -226,6 +229,7 @@ describe('listTypes()', () => {
         enabledInLicense: true,
         supportedFeatureIds: ['alerting'],
         isSystemActionType: false,
+        isDeprecated: false,
       },
       {
         id: '.cases',
@@ -236,6 +240,7 @@ describe('listTypes()', () => {
         enabled: true,
         enabledInConfig: true,
         enabledInLicense: true,
+        isDeprecated: false,
       },
     ]);
   });

x-pack/platform/plugins/shared/actions/server/routes/connector/create/create.test.ts

@@ -51,12 +51,14 @@ describe('createConnectorRoute', () => {
         'isDeprecated',
         'isMissingSecrets',
         'isSystemAction',
+        'isConnectorTypeDeprecated',
       ]),
       connector_type_id: createResult.actionTypeId,
       is_preconfigured: createResult.isPreconfigured,
       is_deprecated: createResult.isDeprecated,
       is_missing_secrets: createResult.isMissingSecrets,
       is_system_action: createResult.isSystemAction,
+      is_connector_type_deprecated: createResult.isConnectorTypeDeprecated,
     };
 
     const actionsClient = actionsClientMock.create();

x-pack/platform/plugins/shared/actions/server/routes/connector/get/get.test.ts

@@ -37,6 +37,7 @@ describe('getConnectorRoute', () => {
       id: '1',
       actionTypeId: '2',
       name: 'action name',
+      isMissingSecrets: false,
     });
 
     const actionsClient = actionsClientMock.create();

x-pack/platform/plugins/shared/actions/server/routes/connector/get_all_system/get_all_system.test.ts

@@ -41,6 +41,7 @@ describe('getAllConnectorsIncludingSystemRoute', () => {
         name: 'my system action',
         actionTypeId: '.system-action-type',
         isMissingSecrets: false,
+        config: {},
       }),
     ]);
 
@@ -53,6 +54,7 @@ describe('getAllConnectorsIncludingSystemRoute', () => {
             "config": Object {},
             "connector_type_id": ".system-action-type",
             "id": ".system-action-id",
+            "is_connector_type_deprecated": false,
             "is_deprecated": false,
             "is_missing_secrets": false,
             "is_preconfigured": false,
@@ -78,6 +80,7 @@ describe('getAllConnectorsIncludingSystemRoute', () => {
           is_system_action: true,
           name: 'my system action',
           referenced_by_count: 0,
+          is_connector_type_deprecated: false,
         },
       ],
     });

x-pack/platform/plugins/shared/actions/server/routes/connector/list_types_system/list_types_system.test.ts

@@ -58,6 +58,7 @@ describe('listTypesWithSystemRoute', () => {
             "enabled_in_config": true,
             "enabled_in_license": true,
             "id": "1",
+            "is_deprecated": false,
             "is_system_action_type": true,
             "minimum_license_required": "gold",
             "name": "name",
@@ -82,6 +83,7 @@ describe('listTypesWithSystemRoute', () => {
           minimum_license_required: 'gold',
           is_system_action_type: true,
           sub_feature: 'endpointSecurity',
+          is_deprecated: false,
         },
       ],
     });
@@ -126,6 +128,7 @@ describe('listTypesWithSystemRoute', () => {
             "enabled_in_config": true,
             "enabled_in_license": true,
             "id": "1",
+            "is_deprecated": false,
             "is_system_action_type": false,
             "minimum_license_required": "gold",
             "name": "name",
@@ -159,6 +162,7 @@ describe('listTypesWithSystemRoute', () => {
           supported_feature_ids: ['alerting'],
           minimum_license_required: 'gold',
           is_system_action_type: false,
+          is_deprecated: false,
         },
       ],
     });

x-pack/platform/test/alerting_api_integration/security_and_spaces/group2/tests/actions/get.ts

@@ -65,6 +65,7 @@ export default function getConnectorTests({ getService }: FtrProviderContext) {
                 is_system_action: false,
                 connector_type_id: 'test.index-record',
                 is_deprecated: false,
+                is_connector_type_deprecated: false,
                 is_missing_secrets: false,
                 name: 'My Connector',
                 config: {