[8.x] [Security solution] assistantKnowledgeBaseByDefault flag remo…

…ved (#198180) (#199859) # Backport This will backport the following commits from `main` to `8.x`: - [[Security solution] `assistantKnowledgeBaseByDefault` flag removed (#198180)](#198180)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)
elastic · Nov 12, 2024 · 25d5b95 · 25d5b95
1 parent 35c1928
commit 25d5b95
Show file tree

Hide file tree

Showing 84 changed files with 253 additions and 3,168 deletions.
diff --git a/api_docs/kbn_elastic_assistant_common.devdocs.json b/api_docs/kbn_elastic_assistant_common.devdocs.json
@@ -844,7 +844,7 @@
           "\nInterface for features available to the elastic assistant"
         ],
         "signature": [
-          "{ readonly assistantKnowledgeBaseByDefault: boolean; readonly assistantModelEvaluation: boolean; }"
+          "{ readonly assistantModelEvaluation: boolean; }"
         ],
         "path": "x-pack/packages/kbn-elastic-assistant-common/impl/capabilities/index.ts",
         "deprecated": false,
@@ -2574,7 +2574,7 @@
         "label": "GetCapabilitiesResponse",
         "description": [],
         "signature": [
-          "{ assistantKnowledgeBaseByDefault: boolean; assistantModelEvaluation: boolean; }"
+          "{ assistantModelEvaluation: boolean; }"
         ],
         "path": "x-pack/packages/kbn-elastic-assistant-common/impl/schemas/capabilities/get_capabilities_route.gen.ts",
         "deprecated": false,
@@ -4522,7 +4522,7 @@
           "\nDefault features available to the elastic assistant"
         ],
         "signature": [
-          "{ readonly assistantKnowledgeBaseByDefault: false; readonly assistantModelEvaluation: false; }"
+          "{ readonly assistantModelEvaluation: false; }"
         ],
         "path": "x-pack/packages/kbn-elastic-assistant-common/impl/capabilities/index.ts",
         "deprecated": false,
@@ -4987,7 +4987,7 @@
         "label": "GetCapabilitiesResponse",
         "description": [],
         "signature": [
-          "Zod.ZodObject<{ assistantKnowledgeBaseByDefault: Zod.ZodBoolean; assistantModelEvaluation: Zod.ZodBoolean; }, \"strip\", Zod.ZodTypeAny, { assistantKnowledgeBaseByDefault: boolean; assistantModelEvaluation: boolean; }, { assistantKnowledgeBaseByDefault: boolean; assistantModelEvaluation: boolean; }>"
+          "Zod.ZodObject<{ assistantModelEvaluation: Zod.ZodBoolean; }, \"strip\", Zod.ZodTypeAny, { assistantModelEvaluation: boolean; }, { assistantModelEvaluation: boolean; }>"
         ],
         "path": "x-pack/packages/kbn-elastic-assistant-common/impl/schemas/capabilities/get_capabilities_route.gen.ts",
         "deprecated": false,

diff --git a/api_docs/security_solution.devdocs.json b/api_docs/security_solution.devdocs.json
diff --git a/x-pack/packages/kbn-elastic-assistant-common/impl/capabilities/index.ts b/x-pack/packages/kbn-elastic-assistant-common/impl/capabilities/index.ts
@@ -19,6 +19,5 @@ export type AssistantFeatureKey = keyof AssistantFeatures;
  * Default features available to the elastic assistant
  */
 export const defaultAssistantFeatures = Object.freeze({
-  assistantKnowledgeBaseByDefault: true,
   assistantModelEvaluation: false,
 });
diff --git a/...ages/kbn-elastic-assistant-common/impl/schemas/capabilities/get_capabilities_route.gen.ts b/...ages/kbn-elastic-assistant-common/impl/schemas/capabilities/get_capabilities_route.gen.ts
@@ -18,6 +18,5 @@ import { z } from '@kbn/zod';
 
 export type GetCapabilitiesResponse = z.infer<typeof GetCapabilitiesResponse>;
 export const GetCapabilitiesResponse = z.object({
-  assistantKnowledgeBaseByDefault: z.boolean(),
   assistantModelEvaluation: z.boolean(),
 });
diff --git a/...kbn-elastic-assistant-common/impl/schemas/capabilities/get_capabilities_route.schema.yaml b/...kbn-elastic-assistant-common/impl/schemas/capabilities/get_capabilities_route.schema.yaml
@@ -20,12 +20,9 @@ paths:
               schema:
                 type: object
                 properties:
-                  assistantKnowledgeBaseByDefault:
-                    type: boolean
                   assistantModelEvaluation:
                     type: boolean
                 required:
-                  - assistantKnowledgeBaseByDefault
                   - assistantModelEvaluation
         '400':
           description: Generic Error

diff --git a/...ck/packages/kbn-elastic-assistant-common/impl/schemas/knowledge_base/crud_kb_route.gen.ts b/...ck/packages/kbn-elastic-assistant-common/impl/schemas/knowledge_base/crud_kb_route.gen.ts
@@ -55,20 +55,6 @@ export type CreateKnowledgeBaseRequestParamsInput = z.input<
 export type CreateKnowledgeBaseResponse = z.infer<typeof CreateKnowledgeBaseResponse>;
 export const CreateKnowledgeBaseResponse = KnowledgeBaseResponse;
 
-export type DeleteKnowledgeBaseRequestParams = z.infer<typeof DeleteKnowledgeBaseRequestParams>;
-export const DeleteKnowledgeBaseRequestParams = z.object({
-  /**
-   * The KnowledgeBase `resource` value.
-   */
-  resource: z.string().optional(),
-});
-export type DeleteKnowledgeBaseRequestParamsInput = z.input<
-  typeof DeleteKnowledgeBaseRequestParams
->;
-
-export type DeleteKnowledgeBaseResponse = z.infer<typeof DeleteKnowledgeBaseResponse>;
-export const DeleteKnowledgeBaseResponse = KnowledgeBaseResponse;
-
 export type ReadKnowledgeBaseRequestParams = z.infer<typeof ReadKnowledgeBaseRequestParams>;
 export const ReadKnowledgeBaseRequestParams = z.object({
   /**

diff --git a/...ckages/kbn-elastic-assistant-common/impl/schemas/knowledge_base/crud_kb_route.schema.yaml b/...ckages/kbn-elastic-assistant-common/impl/schemas/knowledge_base/crud_kb_route.schema.yaml
@@ -100,40 +100,6 @@ paths:
                     type: string
                   message:
                     type: string
-    delete:
-      x-codegen-enabled: true
-      x-labels: [ess, serverless]
-      operationId: DeleteKnowledgeBase
-      description: Deletes KnowledgeBase with the `resource` field.
-      summary: Deletes a KnowledgeBase
-      tags:
-        - KnowledgeBase API
-      parameters:
-        - name: resource
-          in: path
-          description: The KnowledgeBase `resource` value.
-          schema:
-            type: string
-      responses:
-        200:
-          description: Indicates a successful call.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/KnowledgeBaseResponse'
-        400:
-          description: Generic Error
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  statusCode:
-                    type: number
-                  error:
-                    type: string
-                  message:
-                    type: string
 
 components:
   schemas:

diff --git a/...on/impl/schemas/knowledge_base/entries/bulk_crud_knowledge_base_entries_route.schema.yaml b/...on/impl/schemas/knowledge_base/entries/bulk_crud_knowledge_base_entries_route.schema.yaml
@@ -6,7 +6,7 @@ paths:
   /internal/elastic_assistant/knowledge_base/entries/_bulk_action:
     post:
       x-codegen-enabled: true
-      # This API is still behind the `assistantKnowledgeBaseByDefault` feature flag
+      # Targeted to update to public by 8.18
       x-internal: true
       x-labels: [ess, serverless]
       operationId: PerformKnowledgeBaseEntryBulkAction

diff --git a/...-common/impl/schemas/knowledge_base/entries/crud_knowledge_base_entries_route.schema.yaml b/...-common/impl/schemas/knowledge_base/entries/crud_knowledge_base_entries_route.schema.yaml
@@ -6,7 +6,7 @@ paths:
   /internal/elastic_assistant/knowledge_base/entries:
     post:
       x-codegen-enabled: true
-      # This API is still behind the `assistantKnowledgeBaseByDefault` feature flag
+      # Targeted to update to public by 8.18
       x-internal: true
       x-labels: [ess, serverless]
       operationId: CreateKnowledgeBaseEntry
@@ -37,7 +37,7 @@ paths:
   /internal/elastic_assistant/knowledge_base/entries/{id}:
     get:
       x-codegen-enabled: true
-      # This API is still behind the `assistantKnowledgeBaseByDefault` feature flag
+      # Targeted to update to public by 8.18
       x-internal: true
       x-labels: [ess, serverless]
       operationId: ReadKnowledgeBaseEntry
@@ -67,7 +67,7 @@ paths:
                 $ref: './common_attributes.schema.yaml#/components/schemas/KnowledgeBaseEntryErrorSchema'
     put:
       x-codegen-enabled: true
-      # This API is still behind the `assistantKnowledgeBaseByDefault` feature flag
+      # Targeted to update to public by 8.18
       x-internal: true
       x-labels: [ess, serverless]
       operationId: UpdateKnowledgeBaseEntry
@@ -103,7 +103,7 @@ paths:
                 $ref: './common_attributes.schema.yaml#/components/schemas/KnowledgeBaseEntryErrorSchema'
     delete:
       x-codegen-enabled: true
-      # This API is still behind the `assistantKnowledgeBaseByDefault` feature flag
+      # Targeted to update to public by 8.18
       x-internal: true
       x-labels: [ess, serverless]
       operationId: DeleteKnowledgeBaseEntry

diff --git a/...-common/impl/schemas/knowledge_base/entries/find_knowledge_base_entries_route.schema.yaml b/...-common/impl/schemas/knowledge_base/entries/find_knowledge_base_entries_route.schema.yaml
@@ -6,7 +6,7 @@ paths:
   /internal/elastic_assistant/knowledge_base/entries/_find:
     get:
       x-codegen-enabled: true
-      # This API is still behind the `assistantKnowledgeBaseByDefault` feature flag
+      # Targeted to update to public by 8.18
       x-internal: true
       x-labels: [ess, serverless]
       operationId: FindKnowledgeBaseEntries

diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/api/knowledge_base/api.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/api/knowledge_base/api.test.tsx
@@ -7,12 +7,7 @@
 
 import { HttpSetup } from '@kbn/core-http-browser';
 
-import {
-  deleteKnowledgeBase,
-  getKnowledgeBaseIndices,
-  getKnowledgeBaseStatus,
-  postKnowledgeBase,
-} from './api';
+import { getKnowledgeBaseIndices, getKnowledgeBaseStatus, postKnowledgeBase } from './api';
 
 jest.mock('@kbn/core-http-browser');
 
@@ -78,29 +73,6 @@ describe('API tests', () => {
     });
   });
 
-  describe('deleteKnowledgeBase', () => {
-    it('calls the knowledge base API when correct resource path', async () => {
-      await deleteKnowledgeBase(knowledgeBaseArgs);
-
-      expect(mockHttp.fetch).toHaveBeenCalledWith(
-        '/internal/elastic_assistant/knowledge_base/a-resource',
-        {
-          method: 'DELETE',
-          signal: undefined,
-          version: '1',
-        }
-      );
-    });
-    it('returns error when error is an error', async () => {
-      const error = 'simulated error';
-      (mockHttp.fetch as jest.Mock).mockImplementation(() => {
-        throw new Error(error);
-      });
-
-      await expect(deleteKnowledgeBase(knowledgeBaseArgs)).resolves.toThrowError('simulated error');
-    });
-  });
-
   describe('getKnowledgeBaseIndices', () => {
     it('calls the knowledge base API when correct resource path', async () => {
       await getKnowledgeBaseIndices({ http: mockHttp });

diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/api/knowledge_base/api.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/api/knowledge_base/api.tsx
@@ -9,8 +9,6 @@ import {
   API_VERSIONS,
   CreateKnowledgeBaseRequestParams,
   CreateKnowledgeBaseResponse,
-  DeleteKnowledgeBaseRequestParams,
-  DeleteKnowledgeBaseResponse,
   ELASTIC_AI_ASSISTANT_KNOWLEDGE_BASE_INDICES_URL,
   ELASTIC_AI_ASSISTANT_KNOWLEDGE_BASE_URL,
   GetKnowledgeBaseIndicesResponse,
@@ -79,38 +77,6 @@ export const postKnowledgeBase = async ({
   return response as CreateKnowledgeBaseResponse;
 };
 
-/**
- * API call for deleting the Knowledge Base. Provide a resource to delete that specific resource.
- *
- * @param {Object} options - The options object.
- * @param {HttpSetup} options.http - HttpSetup
- * @param {string} [options.resource] - Resource to be deleted from the KB, otherwise delete the entire KB
- * @param {AbortSignal} [options.signal] - AbortSignal
- *
- * @returns {Promise<DeleteKnowledgeBaseResponse | IHttpFetchError>}
- */
-export const deleteKnowledgeBase = async ({
-  http,
-  resource,
-  signal,
-}: DeleteKnowledgeBaseRequestParams & {
-  http: HttpSetup;
-  signal?: AbortSignal | undefined;
-}): Promise<DeleteKnowledgeBaseResponse | IHttpFetchError> => {
-  try {
-    const path = ELASTIC_AI_ASSISTANT_KNOWLEDGE_BASE_URL.replace('{resource?}', resource || '');
-    const response = await http.fetch(path, {
-      method: 'DELETE',
-      signal,
-      version: API_VERSIONS.internal.v1,
-    });
-
-    return response as DeleteKnowledgeBaseResponse;
-  } catch (error) {
-    return error as IHttpFetchError;
-  }
-};
-
 /**
  * API call for getting indices that have fields of `semantic_text` type.
  *

diff --git a/...bn-elastic-assistant/impl/assistant/api/knowledge_base/use_delete_knowledge_base.test.tsx b/...bn-elastic-assistant/impl/assistant/api/knowledge_base/use_delete_knowledge_base.test.tsx