Revert "[Enterprise Search] Add preferences to connectors (#150165)"

This reverts commit f5af84f.
elastic · Feb 6, 2023 · ead270f · ead270f
1 parent 8705a6a
commit ead270f
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 27 deletions.
diff --git a/x-pack/plugins/enterprise_search/common/types/connectors.ts b/x-pack/plugins/enterprise_search/common/types/connectors.ts
@@ -27,10 +27,6 @@ export interface CustomScheduling {
 
 export type ConnectorCustomScheduling = Record<string, CustomScheduling | null>;
 
-export interface ConnectorPreferences extends Record<string, unknown> {
-  extract_full_html?: boolean | null;
-}
-
 export enum ConnectorStatus {
   CREATED = 'created',
   NEEDS_CONFIGURATION = 'needs_configuration',
@@ -154,7 +150,6 @@ export interface Connector {
   last_synced: string | null;
   name: string;
   pipeline?: IngestPipelineParams | null;
-  preferences: ConnectorPreferences;
   scheduling: {
     enabled: boolean;
     interval: string; // crontab syntax

diff --git a/...ise_search/public/applications/enterprise_search_content/__mocks__/search_indices.mock.ts b/...ise_search/public/applications/enterprise_search_content/__mocks__/search_indices.mock.ts
@@ -105,7 +105,6 @@ export const indices: ElasticsearchIndexWithIngestion[] = [
       last_sync_status: SyncStatus.COMPLETED,
       last_synced: null,
       name: 'connector',
-      preferences: { extract_full_html: false },
       scheduling: {
         enabled: false,
         interval: '',
@@ -201,7 +200,6 @@ export const indices: ElasticsearchIndexWithIngestion[] = [
       last_sync_status: SyncStatus.COMPLETED,
       last_synced: null,
       name: 'crawler',
-      preferences: { extract_full_html: false },
       scheduling: {
         enabled: false,
         interval: '',

diff --git a/...erprise_search/public/applications/enterprise_search_content/__mocks__/view_index.mock.ts b/...erprise_search/public/applications/enterprise_search_content/__mocks__/view_index.mock.ts
@@ -115,7 +115,6 @@ export const connectorIndex: ConnectorViewIndex = {
     last_sync_status: SyncStatus.COMPLETED,
     last_synced: null,
     name: 'connector',
-    preferences: { extract_full_html: false },
     scheduling: {
       enabled: false,
       interval: '',
@@ -215,7 +214,6 @@ export const crawlerIndex: CrawlerViewIndex = {
     last_sync_status: SyncStatus.COMPLETED,
     last_synced: null,
     name: 'crawler',
-    preferences: { extract_full_html: false },
     scheduling: {
       enabled: false,
       interval: '',

diff --git a/x-pack/plugins/enterprise_search/server/index_management/setup_indices.test.ts b/x-pack/plugins/enterprise_search/server/index_management/setup_indices.test.ts
@@ -140,11 +140,6 @@ describe('Setup Indices', () => {
           run_ml_inference: { type: 'boolean' },
         },
       },
-      preferences: {
-        properties: {
-          extract_full_html: { type: 'boolean' },
-        },
-      },
       scheduling: {
         properties: {
           enabled: { type: 'boolean' },

diff --git a/x-pack/plugins/enterprise_search/server/index_management/setup_indices.ts b/x-pack/plugins/enterprise_search/server/index_management/setup_indices.ts
@@ -130,11 +130,6 @@ const connectorMappingsProperties: Record<string, MappingProperty> = {
       run_ml_inference: { type: 'boolean' },
     },
   },
-  preferences: {
-    properties: {
-      extract_full_html: { type: 'boolean' },
-    },
-  },
   scheduling: {
     properties: {
       enabled: { type: 'boolean' },

diff --git a/x-pack/plugins/enterprise_search/server/lib/connectors/add_connector.test.ts b/x-pack/plugins/enterprise_search/server/lib/connectors/add_connector.test.ts
@@ -154,7 +154,6 @@ describe('addConnector lib function', () => {
           reduce_whitespace: true,
           run_ml_inference: false,
         },
-        preferences: {},
         scheduling: { enabled: false, interval: '0 0 0 * * ?' },
         service_type: null,
         status: ConnectorStatus.CREATED,
@@ -340,7 +339,6 @@ describe('addConnector lib function', () => {
           reduce_whitespace: true,
           run_ml_inference: false,
         },
-        preferences: {},
         scheduling: { enabled: false, interval: '0 0 0 * * ?' },
         service_type: null,
         status: ConnectorStatus.CREATED,
@@ -448,7 +446,6 @@ describe('addConnector lib function', () => {
           reduce_whitespace: true,
           run_ml_inference: false,
         },
-        preferences: {},
         scheduling: { enabled: false, interval: '0 0 0 * * ?' },
         service_type: null,
         status: ConnectorStatus.CREATED,

diff --git a/x-pack/plugins/enterprise_search/server/lib/connectors/add_connector.ts b/x-pack/plugins/enterprise_search/server/lib/connectors/add_connector.ts
@@ -164,7 +164,6 @@ export const addConnector = async (
           run_ml_inference: connectorsPipelineMeta.default_run_ml_inference,
         }
       : null,
-    preferences: {},
     scheduling: { enabled: false, interval: '0 0 0 * * ?' },
     service_type: input.service_type || null,
     status: ConnectorStatus.CREATED,

diff --git a/x-pack/plugins/enterprise_search/server/lib/connectors/start_sync.test.ts b/x-pack/plugins/enterprise_search/server/lib/connectors/start_sync.test.ts
@@ -42,7 +42,6 @@ describe('addConnector lib function', () => {
           last_sync_error: null,
           last_sync_status: null,
           last_synced: null,
-          preferences: {},
           scheduling: { enabled: true, interval: '1 2 3 4 5' },
           service_type: null,
           status: 'not connected',
@@ -68,7 +67,6 @@ describe('addConnector lib function', () => {
         last_sync_error: null,
         last_sync_status: null,
         last_synced: null,
-        preferences: {},
         scheduling: { enabled: true, interval: '1 2 3 4 5' },
         service_type: null,
         status: 'not connected',

diff --git a/x-pack/plugins/enterprise_search/server/lib/connectors/update_connector_scheduling.test.ts b/x-pack/plugins/enterprise_search/server/lib/connectors/update_connector_scheduling.test.ts
@@ -41,7 +41,6 @@ describe('addConnector lib function', () => {
           last_sync_error: null,
           last_sync_status: null,
           last_synced: null,
-          preferences: {},
           scheduling: { enabled: false, interval: '* * * * *' },
           service_type: null,
           status: 'not connected',
@@ -70,7 +69,6 @@ describe('addConnector lib function', () => {
         last_sync_error: null,
         last_sync_status: null,
         last_synced: null,
-        preferences: {},
         scheduling: { enabled: true, interval: '1 2 3 4 5' },
         service_type: null,
         status: 'not connected',