[ResponseOps] Granular Connector RBAC

src/platform/packages/shared/kbn-actions-types/action_types.ts

@@ -9,10 +9,10 @@
 
 import type { LicenseType } from '@kbn/licensing-plugin/common/types';
 
-export enum SUB_FEATURE_TYPE {
-  edr,
+export enum SUB_FEATURE {
+  endpointSecurity,
 }
-export type SubFeatureType = keyof typeof SUB_FEATURE_TYPE;
+export type SubFeature = keyof typeof SUB_FEATURE;
 
 export interface ActionType {
   id: string;
@@ -23,5 +23,5 @@ export interface ActionType {
   minimumLicenseRequired: LicenseType;
   supportedFeatureIds: string[];
   isSystemActionType: boolean;
-  subFeatureType?: SubFeatureType;
+  subFeature?: SubFeature;
 }

src/platform/packages/shared/kbn-alerts-ui-shared/src/common/apis/fetch_connector_types/transform_connector_types_response.test.ts

@@ -21,7 +21,7 @@ describe('transformConnectorTypesResponse', () => {
         minimum_license_required: 'basic',
         supported_feature_ids: ['stackAlerts'],
         is_system_action_type: true,
-        sub_feature_type: 'edr',
+        sub_feature: 'endpointSecurity',
       },
       {
         id: 'actionType2Id',
@@ -45,7 +45,7 @@ describe('transformConnectorTypesResponse', () => {
         minimumLicenseRequired: 'basic',
         supportedFeatureIds: ['stackAlerts'],
         isSystemActionType: true,
-        subFeatureType: 'edr',
+        subFeature: 'endpointSecurity',
       },
       {
         id: 'actionType2Id',

src/platform/packages/shared/kbn-alerts-ui-shared/src/common/apis/fetch_connector_types/transform_connector_types_response.ts

@@ -15,15 +15,15 @@ const transformConnectorType: RewriteRequestCase<ActionType> = ({
   minimum_license_required: minimumLicenseRequired,
   supported_feature_ids: supportedFeatureIds,
   is_system_action_type: isSystemActionType,
-  sub_feature_type: subFeatureType,
+  sub_feature: subFeature,
   ...res
 }: AsApiContract<ActionType>) => ({
   enabledInConfig,
   enabledInLicense,
   minimumLicenseRequired,
   supportedFeatureIds,
   isSystemActionType,
-  subFeatureType,
+  subFeature,
   ...res,
 });
 

src/platform/packages/shared/kbn-alerts-ui-shared/src/common/types/action_types.ts

@@ -11,7 +11,7 @@ import type { ComponentType, ReactNode } from 'react';
 import type { RuleActionParam, ActionVariable } from '@kbn/alerting-types';
 import { IconType, RecursivePartial } from '@elastic/eui';
 import { PublicMethodsOf } from '@kbn/utility-types';
-import { SubFeatureType } from '@kbn/actions-types';
+import { SubFeature } from '@kbn/actions-types';
 import { TypeRegistry } from '../type_registry';
 import { RuleFormParamsErrors } from './rule_types';
 
@@ -131,7 +131,7 @@ export interface ActionTypeModel<ActionConfig = any, ActionSecrets = any, Action
   hideInUi?: boolean;
   modalWidth?: number;
   isSystemActionType?: boolean;
-  subFeatureType?: SubFeatureType;
+  subFeature?: SubFeature;
 }
 
 export type ActionTypeRegistryContract<Connector = unknown, Params = unknown> = PublicMethodsOf<

x-pack/platform/packages/shared/kbn-elastic-assistant/impl/mock/connectors.ts

@@ -18,7 +18,7 @@ export const mockActionTypes = [
     minimumLicenseRequired: 'basic',
     isSystemActionType: true,
     supportedFeatureIds: ['generativeAI'],
-    subFeatureType: undefined,
+    subFeature: undefined,
   } as ActionType,
   {
     id: '.bedrock',
@@ -29,7 +29,7 @@ export const mockActionTypes = [
     minimumLicenseRequired: 'basic',
     isSystemActionType: true,
     supportedFeatureIds: ['generativeAI'],
-    subFeatureType: undefined,
+    subFeature: undefined,
   } as ActionType,
   {
     id: '.gemini',
@@ -40,7 +40,7 @@ export const mockActionTypes = [
     minimumLicenseRequired: 'basic',
     isSystemActionType: true,
     supportedFeatureIds: ['generativeAI'],
-    subFeatureType: undefined,
+    subFeature: undefined,
   } as ActionType,
 ];
 

x-pack/platform/plugins/shared/actions/common/connector_feature_config.ts

@@ -28,10 +28,10 @@ export const SecurityConnectorFeatureId = 'siem';
 export const GenerativeAIForSecurityConnectorFeatureId = 'generativeAIForSecurity';
 export const GenerativeAIForObservabilityConnectorFeatureId = 'generativeAIForObservability';
 export const GenerativeAIForSearchPlaygroundConnectorFeatureId = 'generativeAIForSearchPlayground';
-export const EdrConnectorFeatureId = 'edr';
+export const EndpointSecurityConnectorFeatureId = 'endpointSecurity';
 
-const compatibilityEdr = i18n.translate(
-  'xpack.actions.availableConnectorFeatures.compatibility.edr',
+const compatibilityEndpointSecurity = i18n.translate(
+  'xpack.actions.availableConnectorFeatures.compatibility.endpointSecurity',
   {
     defaultMessage: 'Endpoint Security',
   }
@@ -128,10 +128,10 @@ export const GenerativeAIForSearchPlaygroundFeature: ConnectorFeatureConfig = {
   compatibility: compatibilityGenerativeAIForSearchPlayground,
 };
 
-export const EdrConnectorFeature: ConnectorFeatureConfig = {
-  id: EdrConnectorFeatureId,
-  name: compatibilityEdr,
-  compatibility: compatibilityEdr,
+export const EndpointSecurityConnectorFeature: ConnectorFeatureConfig = {
+  id: EndpointSecurityConnectorFeatureId,
+  name: compatibilityEndpointSecurity,
+  compatibility: compatibilityEndpointSecurity,
 };
 
 const AllAvailableConnectorFeatures = {
@@ -142,7 +142,7 @@ const AllAvailableConnectorFeatures = {
   [GenerativeAIForSecurityFeature.id]: GenerativeAIForSecurityFeature,
   [GenerativeAIForObservabilityFeature.id]: GenerativeAIForObservabilityFeature,
   [GenerativeAIForSearchPlaygroundFeature.id]: GenerativeAIForSearchPlaygroundFeature,
-  [EdrConnectorFeature.id]: EdrConnectorFeature,
+  [EndpointSecurityConnectorFeature.id]: EndpointSecurityConnectorFeature,
 };
 
 export function areValidFeatures(ids: string[]) {

x-pack/platform/plugins/shared/actions/common/routes/connector/response/schemas/v1.ts

@@ -97,8 +97,8 @@ export const connectorTypesResponseSchema = schema.object({
   is_system_action_type: schema.boolean({
     meta: { description: 'Indicates whether the action is a system action.' },
   }),
-  sub_feature_type: schema.maybe(
-    schema.oneOf([schema.literal('edr')], {
+  sub_feature: schema.maybe(
+    schema.oneOf([schema.literal('endpointSecurity')], {
       meta: {
         description: 'Indicates the sub-feature type the connector is grouped under.',
       },

x-pack/platform/plugins/shared/actions/common/routes/connector/response/types/v1.ts

@@ -41,7 +41,7 @@ export interface ConnectorTypesResponse {
   minimum_license_required: ConnectorTypesResponseSchemaType['minimum_license_required'];
   supported_feature_ids: ConnectorTypesResponseSchemaType['supported_feature_ids'];
   is_system_action_type: ConnectorTypesResponseSchemaType['is_system_action_type'];
-  sub_feature_type?: ConnectorTypesResponseSchemaType['sub_feature_type'];
+  sub_feature?: ConnectorTypesResponseSchemaType['sub_feature'];
 }
 
 type ConnectorExecuteResponseSchemaType = TypeOf<typeof connectorExecuteResponseSchema>;

x-pack/platform/plugins/shared/actions/common/types.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SUB_FEATURE_TYPE } from '@kbn/actions-types';
+import { SUB_FEATURE } from '@kbn/actions-types';
 import { LicenseType } from '@kbn/licensing-plugin/common/types';
 import { TaskErrorSource } from '@kbn/task-manager-plugin/common';
 
@@ -17,7 +17,7 @@ export {
   GenerativeAIForSecurityConnectorFeatureId,
 } from './connector_feature_config';
 
-export type SubFeatureType = keyof typeof SUB_FEATURE_TYPE;
+export type SubFeature = keyof typeof SUB_FEATURE;
 
 export interface ActionType {
   id: string;
@@ -28,7 +28,7 @@ export interface ActionType {
   minimumLicenseRequired: LicenseType;
   supportedFeatureIds: string[];
   isSystemActionType: boolean;
-  subFeatureType?: SubFeatureType;
+  subFeature?: SubFeature;
 }
 
 export enum InvalidEmailReason {

x-pack/platform/plugins/shared/actions/server/action_type_registry.mock.ts

@@ -20,7 +20,7 @@ const createActionTypeRegistryMock = () => {
     isSystemActionType: jest.fn(),
     getUtils: jest.fn(),
     getActionKibanaPrivileges: jest.fn(),
-    hasSubFeatureType: jest.fn(),
+    hasSubFeature: jest.fn(),
   };
   return mocked;
 };

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

@@ -422,13 +422,13 @@ describe('actionTypeRegistry', () => {
       ]);
     });
 
-    test('sets the subFeatureType correctly for sub-feature type actions', () => {
+    test('sets the subFeature correctly for sub-feature type actions', () => {
       mockedLicenseState.isLicenseValidForActionType.mockReturnValue({ isValid: true });
       const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
 
       actionTypeRegistry.register({
         id: 'test.sub-feature-action',
-        name: 'EDR',
+        name: 'Test',
         minimumLicenseRequired: 'platinum',
         supportedFeatureIds: ['siem'],
         getKibanaPrivileges: () => ['test/create-sub-feature'],
@@ -437,7 +437,7 @@ describe('actionTypeRegistry', () => {
           secrets: { schema: schema.object({}) },
           params: { schema: schema.object({}) },
         },
-        subFeatureType: 'edr',
+        subFeature: 'endpointSecurity',
         executor,
       });
 
@@ -451,8 +451,8 @@ describe('actionTypeRegistry', () => {
           id: 'test.sub-feature-action',
           isSystemActionType: false,
           minimumLicenseRequired: 'platinum',
-          name: 'EDR',
-          subFeatureType: 'edr',
+          name: 'Test',
+          subFeature: 'endpointSecurity',
           supportedFeatureIds: ['siem'],
         },
       ]);
@@ -803,13 +803,13 @@ describe('actionTypeRegistry', () => {
     });
   });
 
-  describe('hasSubFeatureType()', () => {
+  describe('hasSubFeature()', () => {
     it('should return true if the action type has a sub-feature type', () => {
       const registry = new ActionTypeRegistry(actionTypeRegistryParams);
 
       registry.register({
         id: 'test.sub-feature-action',
-        name: 'EDR',
+        name: 'Test',
         minimumLicenseRequired: 'platinum',
         supportedFeatureIds: ['siem'],
         getKibanaPrivileges: () => ['test/create-sub-feature'],
@@ -818,11 +818,11 @@ describe('actionTypeRegistry', () => {
           secrets: { schema: schema.object({}) },
           params: { schema: schema.object({}) },
         },
-        subFeatureType: 'edr',
+        subFeature: 'endpointSecurity',
         executor,
       });
 
-      const result = registry.hasSubFeatureType('test.sub-feature-action');
+      const result = registry.hasSubFeature('test.sub-feature-action');
       expect(result).toBe(true);
     });
 
@@ -847,7 +847,7 @@ describe('actionTypeRegistry', () => {
       const allTypes = registry.getAllTypes();
       expect(allTypes.length).toBe(1);
 
-      const result = registry.hasSubFeatureType('foo');
+      const result = registry.hasSubFeature('foo');
       expect(result).toBe(false);
     });
 
@@ -857,7 +857,7 @@ describe('actionTypeRegistry', () => {
       const allTypes = registry.getAllTypes();
       expect(allTypes.length).toBe(0);
 
-      const result = registry.hasSubFeatureType('not-exist');
+      const result = registry.hasSubFeature('not-exist');
       expect(result).toBe(false);
     });
   });
@@ -882,7 +882,7 @@ describe('actionTypeRegistry', () => {
       });
       registry.register({
         id: 'test.sub-feature-action',
-        name: 'EDR',
+        name: 'Test',
         minimumLicenseRequired: 'platinum',
         supportedFeatureIds: ['siem'],
         getKibanaPrivileges: () => ['test/create-sub-feature'],
@@ -891,7 +891,7 @@ describe('actionTypeRegistry', () => {
           secrets: { schema: schema.object({}) },
           params: { schema: schema.object({}) },
         },
-        subFeatureType: 'edr',
+        subFeature: 'endpointSecurity',
         executor,
       });
 
@@ -919,15 +919,15 @@ describe('actionTypeRegistry', () => {
       });
       registry.register({
         id: 'test.sub-feature-action',
-        name: 'EDR',
+        name: 'Test',
         minimumLicenseRequired: 'platinum',
         supportedFeatureIds: ['siem'],
         validate: {
           config: { schema: schema.object({}) },
           secrets: { schema: schema.object({}) },
           params: { schema: schema.object({}) },
         },
-        subFeatureType: 'edr',
+        subFeature: 'endpointSecurity',
         executor,
       });
 

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

@@ -119,8 +119,8 @@ export class ActionTypeRegistry {
   /**
    * Returns true if the connector type has a sub-feature type defined
    */
-  public hasSubFeatureType = (actionTypeId: string): boolean =>
-    Boolean(this.actionTypes.get(actionTypeId)?.subFeatureType);
+  public hasSubFeature = (actionTypeId: string): boolean =>
+    Boolean(this.actionTypes.get(actionTypeId)?.subFeature);
 
   /**
    * Returns the kibana privileges
@@ -132,7 +132,7 @@ export class ActionTypeRegistry {
   ): string[] {
     const actionType = this.actionTypes.get(actionTypeId);
 
-    if (!actionType?.isSystemActionType && !actionType?.subFeatureType) {
+    if (!actionType?.isSystemActionType && !actionType?.subFeature) {
       return [];
     }
     return actionType?.getKibanaPrivileges?.({ params, source }) ?? [];
@@ -187,7 +187,7 @@ export class ActionTypeRegistry {
 
     if (
       !actionType.isSystemActionType &&
-      !actionType.subFeatureType &&
+      !actionType.subFeature &&
       actionType.getKibanaPrivileges
     ) {
       throw new Error(
@@ -260,7 +260,7 @@ export class ActionTypeRegistry {
         enabledInLicense: !!this.licenseState.isLicenseValidForActionType(actionType).isValid,
         supportedFeatureIds: actionType.supportedFeatureIds,
         isSystemActionType: !!actionType.isSystemActionType,
-        subFeatureType: actionType.subFeatureType,
+        subFeature: actionType.subFeature,
       }));
   }
 

x-pack/platform/plugins/shared/actions/server/application/connector/schemas/connector_type_schema.ts

@@ -23,5 +23,5 @@ export const connectorTypeSchema = schema.object({
   ]),
   supportedFeatureIds: schema.arrayOf(schema.string()),
   isSystemActionType: schema.boolean(),
-  subFeatureType: schema.maybe(schema.oneOf([schema.literal('edr')])),
+  subFeature: schema.maybe(schema.oneOf([schema.literal('endpointSecurity')])),
 });

x-pack/platform/plugins/shared/actions/server/application/connector/types/connector_type.ts

@@ -19,5 +19,5 @@ export interface ConnectorType {
   minimumLicenseRequired: ConnectorTypeSchemaType['minimumLicenseRequired'];
   supportedFeatureIds: ConnectorTypeSchemaType['supportedFeatureIds'];
   isSystemActionType: ConnectorTypeSchemaType['isSystemActionType'];
-  subFeatureType?: ConnectorTypeSchemaType['subFeatureType'];
+  subFeature?: ConnectorTypeSchemaType['subFeature'];
 }