Remove include_system_actions query from get_all

x-pack/plugins/actions/server/routes/connector/get_all/get_all.ts

@@ -7,10 +7,6 @@
 
 import { IRouter } from '@kbn/core/server';
 import { AllConnectorsResponseV1 } from '../../../../common/routes/connector/response';
-import {
-  connectorsQuerySchemaV1,
-  ConnectorsRequestQueryV1,
-} from '../../../../common/routes/connector/apis/connectors';
 import { transformGetAllConnectorsResponseV1 } from './transforms';
 import { ActionsRequestHandlerContext } from '../../../types';
 import { BASE_ACTION_API_PATH } from '../../../../common';
@@ -24,18 +20,12 @@ export const getAllConnectorsRoute = (
   router.get(
     {
       path: `${BASE_ACTION_API_PATH}/connectors`,
-      validate: {
-        query: connectorsQuerySchemaV1,
-      },
+      validate: {},
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
-        const query: ConnectorsRequestQueryV1 = req.query;
-
         const actionsClient = (await context.actions).getActionsClient();
-        const result = await actionsClient.getAll({
-          includeSystemActions: query?.include_system_actions,
-        });
+        const result = await actionsClient.getAll();
 
         const responseBody: AllConnectorsResponseV1[] = transformGetAllConnectorsResponseV1(result);
         return res.ok({ body: responseBody });

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

@@ -0,0 +1,96 @@
+/*
+ * 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 { getAllConnectorsRoute } from './get_all';
+import { httpServiceMock } from '@kbn/core/server/mocks';
+import { licenseStateMock } from '../../../lib/license_state.mock';
+import { mockHandlerArguments } from '../../legacy/_mock_handler_arguments';
+import { verifyAccessAndContext } from '../../verify_access_and_context';
+import { actionsClientMock } from '../../../actions_client/actions_client.mock';
+
+jest.mock('../../verify_access_and_context', () => ({
+  verifyAccessAndContext: jest.fn(),
+}));
+
+beforeEach(() => {
+  jest.resetAllMocks();
+  (verifyAccessAndContext as jest.Mock).mockImplementation((license, handler) => handler);
+});
+
+describe('getAllConnectorsRoute', () => {
+  it('get all connectors with proper parameters', async () => {
+    const licenseState = licenseStateMock.create();
+    const router = httpServiceMock.createRouter();
+
+    getAllConnectorsRoute(router, licenseState);
+
+    const [config, handler] = router.get.mock.calls[0];
+
+    expect(config.path).toMatchInlineSnapshot(`"/api/actions/connectors"`);
+
+    const actionsClient = actionsClientMock.create();
+    actionsClient.getAll.mockResolvedValueOnce([]);
+
+    const [context, req, res] = mockHandlerArguments({ actionsClient }, {}, ['ok']);
+
+    expect(await handler(context, req, res)).toMatchInlineSnapshot(`
+      Object {
+        "body": Array [],
+      }
+    `);
+
+    expect(actionsClient.getAll).toHaveBeenCalledTimes(1);
+
+    expect(res.ok).toHaveBeenCalledWith({
+      body: [],
+    });
+  });
+
+  it('ensures the license allows getting all connectors', async () => {
+    const licenseState = licenseStateMock.create();
+    const router = httpServiceMock.createRouter();
+
+    getAllConnectorsRoute(router, licenseState);
+
+    const [config, handler] = router.get.mock.calls[0];
+
+    expect(config.path).toMatchInlineSnapshot(`"/api/actions/connectors"`);
+
+    const actionsClient = actionsClientMock.create();
+    actionsClient.getAll.mockResolvedValueOnce([]);
+
+    const [context, req, res] = mockHandlerArguments({ actionsClient }, {}, ['ok']);
+
+    await handler(context, req, res);
+
+    expect(verifyAccessAndContext).toHaveBeenCalledWith(licenseState, expect.any(Function));
+  });
+
+  it('ensures the license check prevents getting all connectors', async () => {
+    const licenseState = licenseStateMock.create();
+    const router = httpServiceMock.createRouter();
+
+    (verifyAccessAndContext as jest.Mock).mockImplementation(() => async () => {
+      throw new Error('OMG');
+    });
+
+    getAllConnectorsRoute(router, licenseState);
+
+    const [config, handler] = router.get.mock.calls[0];
+
+    expect(config.path).toMatchInlineSnapshot(`"/api/actions/connectors"`);
+
+    const actionsClient = actionsClientMock.create();
+    actionsClient.getAll.mockResolvedValueOnce([]);
+
+    const [context, req, res] = mockHandlerArguments({ actionsClient }, {}, ['ok']);
+
+    expect(handler(context, req, res)).rejects.toMatchInlineSnapshot(`[Error: OMG]`);
+
+    expect(verifyAccessAndContext).toHaveBeenCalledWith(licenseState, expect.any(Function));
+  });
+});

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

@@ -0,0 +1,37 @@
+/*
+ * 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 { IRouter } from '@kbn/core/server';
+import { AllConnectorsResponseV1 } from '../../../../common/routes/connector/response';
+import { transformGetAllConnectorsResponseV1 } from './transforms';
+import { ActionsRequestHandlerContext } from '../../../types';
+import { INTERNAL_BASE_ACTION_API_PATH } from '../../../../common';
+import { ILicenseState } from '../../../lib';
+import { verifyAccessAndContext } from '../../verify_access_and_context';
+
+export const getAllSystemConnectorsRoute = (
+  router: IRouter<ActionsRequestHandlerContext>,
+  licenseState: ILicenseState
+) => {
+  router.get(
+    {
+      path: `${INTERNAL_BASE_ACTION_API_PATH}/connectors/system`,
+      validate: {},
+    },
+    router.handleLegacyErrors(
+      verifyAccessAndContext(licenseState, async function (context, req, res) {
+        const actionsClient = (await context.actions).getActionsClient();
+        const result = await actionsClient.getAll({
+          includeSystemActions: true,
+        });
+
+        const responseBody: AllConnectorsResponseV1[] = transformGetAllConnectorsResponseV1(result);
+        return res.ok({ body: responseBody });
+      })
+    )
+  );
+};

x-pack/plugins/actions/common/routes/connector/apis/connectors/types/latest.ts → x-pack/plugins/actions/server/routes/connector/get_all_system/index.ts

@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export * from './v1';
+export { getAllSystemConnectorsRoute } from './get_all_system';

x-pack/plugins/actions/common/routes/connector/apis/connectors/types/v1.ts → x-pack/plugins/actions/server/routes/connector/get_all_system/transforms/index.ts

@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import type { TypeOf } from '@kbn/config-schema';
-import { connectorsQuerySchemaV1 } from '..';
+export { transformGetAllConnectorsResponse } from './transform_connectors_response/latest';
 
-export type ConnectorsRequestQuery = TypeOf<typeof connectorsQuerySchemaV1>;
+export { transformGetAllConnectorsResponse as transformGetAllConnectorsResponseV1 } from './transform_connectors_response/v1';

x-pack/plugins/actions/common/routes/connector/apis/connectors/schemas/latest.ts → x-pack/plugins/actions/server/routes/connector/get_all_system/transforms/transform_connectors_response/latest.ts

@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export * from './v1';
+export { transformGetAllConnectorsResponse } from './v1';

x-pack/plugins/actions/server/routes/connector/get_all_system/transforms/transform_connectors_response/v1.ts

@@ -0,0 +1,37 @@
+/*
+ * 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 { ConnectorWithExtraFindData } from '../../../../../application/connector/types';
+import { AllConnectorsResponseV1 } from '../../../../../../common/routes/connector/response';
+
+export const transformGetAllConnectorsResponse = (
+  results: ConnectorWithExtraFindData[]
+): AllConnectorsResponseV1[] => {
+  return results.map(
+    ({
+      id,
+      name,
+      config,
+      actionTypeId,
+      isPreconfigured,
+      isDeprecated,
+      referencedByCount,
+      isMissingSecrets,
+      isSystemAction,
+    }) => ({
+      id,
+      name,
+      config,
+      connector_type_id: actionTypeId,
+      is_preconfigured: isPreconfigured,
+      is_deprecated: isDeprecated,
+      referenced_by_count: referencedByCount,
+      is_missing_secrets: isMissingSecrets,
+      is_system_action: isSystemAction,
+    })
+  );
+};

x-pack/plugins/actions/server/routes/index.ts

@@ -8,6 +8,7 @@
 import { IRouter } from '@kbn/core/server';
 import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { getAllConnectorsRoute } from './connector/get_all';
+import { getAllSystemConnectorsRoute } from './connector/get_all_system';
 import { listTypesRoute } from './connector/list_types';
 import { ILicenseState } from '../lib';
 import { ActionsRequestHandlerContext } from '../types';
@@ -45,4 +46,5 @@ export function defineRoutes(opts: RouteOptions) {
   getGlobalExecutionKPIRoute(router, licenseState);
 
   getOAuthAccessToken(router, licenseState, actionsConfigUtils);
+  getAllSystemConnectorsRoute(router, licenseState);
 }

x-pack/plugins/alerting/common/rule.ts

@@ -142,11 +142,6 @@ export interface RuleSystemAction {
   params: RuleActionParams;
   type: typeof RuleActionTypes.SYSTEM;
   useAlertDataForTemplate?: boolean;
-  // Workaround for typescript issues where boolean types are only defined in one of the union type members
-  // Allow frequency and alertsFilter to be deemed present in a system action, but require them to be undefined
-  // This prevents code like action.frequency?.someProperty from throwing an error
-  frequency?: undefined;
-  alertsFilter?: undefined;
 }
 
 export type RuleAction = RuleDefaultAction | RuleSystemAction;

x-pack/plugins/triggers_actions_ui/public/application/sections/rule_details/components/rule_actions.tsx

@@ -15,7 +15,7 @@ import {
   EuiLoadingSpinner,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { RuleNotifyWhenType } from '@kbn/alerting-plugin/common';
+import { isSystemAction, RuleDefaultAction, RuleNotifyWhenType } from '@kbn/alerting-plugin/common';
 import { ActionTypeRegistryContract, RuleAction, suspendedComponentWithProps } from '../../../..';
 import { useFetchRuleActionConnectors } from '../../../hooks/use_fetch_rule_action_connectors';
 import { NOTIFY_WHEN_OPTIONS } from '../../rule_form/rule_notify_when';
@@ -51,7 +51,7 @@ export function RuleActions({
     );
   }
 
-  const getNotifyText = (action: RuleAction) =>
+  const getNotifyText = (action: RuleDefaultAction) =>
     (NOTIFY_WHEN_OPTIONS.find((options) => options.value === action.frequency?.notifyWhen)
       ?.inputDisplay ||
       action.frequency?.notifyWhen) ??
@@ -93,14 +93,18 @@ export function RuleActions({
                   <EuiFlexItem grow={false}>
                     <EuiIcon size="s" type="bell" />
                   </EuiFlexItem>
-                  <EuiFlexItem>
-                    <EuiText
-                      data-test-subj={`actionConnectorName-${index}-${actionName || actionTypeId}`}
-                      size="xs"
-                    >
-                      {String(getNotifyText(action))}
-                    </EuiText>
-                  </EuiFlexItem>
+                  {!isSystemAction(action) && (
+                    <EuiFlexItem>
+                      <EuiText
+                        data-test-subj={`actionConnectorName-${index}-${
+                          actionName || actionTypeId
+                        }`}
+                        size="xs"
+                      >
+                        {String(getNotifyText(action))}
+                      </EuiText>
+                    </EuiFlexItem>
+                  )}
                 </EuiFlexGroup>
               </EuiFlexItem>
             </EuiFlexGroup>