Merge remote-tracking branch 'upstream/main' into reduce-cases-page-l…

…oad-bundle-size
elastic · Jun 9, 2023 · 4faf9aa · 4faf9aa
2 parents 8568762 + 352d7c9
commit 4faf9aa
Show file tree

Hide file tree

Showing 34 changed files with 413 additions and 674 deletions.
diff --git a/config/serverless.security.yml b/config/serverless.security.yml
@@ -8,7 +8,11 @@ xpack.uptime.enabled: false
 
 ## Enable the Serverless Security plugin
 xpack.serverless.security.enabled: true
-xpack.serverless.security.productTypes: [{ product_line: 'security', product_tier: 'complete' }]
+xpack.serverless.security.productTypes:
+  [
+    { product_line: 'security', product_tier: 'complete' },
+    { product_line: 'endpoint', product_tier: 'complete' },
+  ]
 
 ## Set the home route
 uiSettings.overrides.defaultRoute: /app/security/get_started

diff --git a/x-pack/plugins/enterprise_search/common/types/connectors.ts b/x-pack/plugins/enterprise_search/common/types/connectors.ts
@@ -201,6 +201,7 @@ export interface Connector {
   index_name: string;
   is_native: boolean;
   language: string | null;
+  last_access_control_sync_error: string | null;
   last_access_control_sync_scheduled_at: string | null;
   last_access_control_sync_status: SyncStatus | null;
   last_incremental_sync_scheduled_at: string | null;

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
@@ -118,6 +118,7 @@ export const indices: ElasticsearchIndexWithIngestion[] = [
       index_name: 'connector',
       is_native: false,
       language: 'en',
+      last_access_control_sync_error: null,
       last_access_control_sync_scheduled_at: null,
       last_access_control_sync_status: SyncStatus.COMPLETED,
       last_incremental_sync_scheduled_at: null,
@@ -233,6 +234,7 @@ export const indices: ElasticsearchIndexWithIngestion[] = [
       index_name: 'crawler',
       is_native: true,
       language: 'en',
+      last_access_control_sync_error: null,
       last_access_control_sync_scheduled_at: null,
       last_access_control_sync_status: SyncStatus.COMPLETED,
       last_incremental_sync_scheduled_at: null,

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
@@ -128,6 +128,7 @@ export const connectorIndex: ConnectorViewIndex = {
     index_name: 'connector',
     is_native: false,
     language: 'en',
+    last_access_control_sync_error: null,
     last_access_control_sync_scheduled_at: null,
     last_access_control_sync_status: SyncStatus.COMPLETED,
     last_incremental_sync_scheduled_at: null,
@@ -247,6 +248,7 @@ export const crawlerIndex: CrawlerViewIndex = {
     index_name: 'crawler',
     is_native: true,
     language: 'en',
+    last_access_control_sync_error: null,
     last_access_control_sync_scheduled_at: null,
     last_access_control_sync_status: SyncStatus.COMPLETED,
     last_incremental_sync_scheduled_at: null,

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
@@ -145,6 +145,7 @@ describe('Setup Indices', () => {
       index_name: { type: 'keyword' },
       is_native: { type: 'boolean' },
       language: { type: 'keyword' },
+      last_access_control_sync_error: { type: 'keyword' },
       last_access_control_sync_scheduled_at: { type: 'date' },
       last_access_control_sync_status: { type: 'keyword' },
       last_deleted_document_count: { type: 'long' },

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
@@ -134,6 +134,7 @@ const connectorMappingsProperties: Record<string, MappingProperty> = {
   index_name: { type: 'keyword' },
   is_native: { type: 'boolean' },
   language: { type: 'keyword' },
+  last_access_control_sync_error: { type: 'keyword' },
   last_access_control_sync_scheduled_at: { type: 'date' },
   last_access_control_sync_status: { type: 'keyword' },
   last_deleted_document_count: { type: 'long' },

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
@@ -144,6 +144,7 @@ describe('addConnector lib function', () => {
         index_name: 'index_name',
         is_native: false,
         language: 'fr',
+        last_access_control_sync_error: null,
         last_access_control_sync_scheduled_at: null,
         last_access_control_sync_status: null,
         last_incremental_sync_scheduled_at: null,
@@ -330,6 +331,7 @@ describe('addConnector lib function', () => {
         index_name: 'index_name',
         is_native: true,
         language: null,
+        last_access_control_sync_error: null,
         last_access_control_sync_scheduled_at: null,
         last_access_control_sync_status: null,
         last_incremental_sync_scheduled_at: null,
@@ -441,6 +443,7 @@ describe('addConnector lib function', () => {
         index_name: 'search-index_name',
         is_native: false,
         language: 'en',
+        last_access_control_sync_error: null,
         last_access_control_sync_scheduled_at: null,
         last_access_control_sync_status: null,
         last_incremental_sync_scheduled_at: null,

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
@@ -40,6 +40,7 @@ describe('startSync lib function', () => {
           error: null,
           index_name: 'index_name',
           language: null,
+          last_access_control_sync_error: null,
           last_access_control_sync_scheduled_at: null,
           last_access_control_sync_status: null,
           last_seen: null,

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
@@ -37,6 +37,7 @@ describe('addConnector lib function', () => {
           custom_scheduling: {},
           error: null,
           index_name: 'index_name',
+          last_access_control_sync_error: null,
           last_access_control_sync_scheduled_at: null,
           last_access_control_sync_status: null,
           last_seen: null,
@@ -68,6 +69,7 @@ describe('addConnector lib function', () => {
         custom_scheduling: {},
         error: null,
         index_name: 'index_name',
+        last_access_control_sync_error: null,
         last_access_control_sync_scheduled_at: null,
         last_access_control_sync_status: null,
         last_seen: null,

diff --git a/x-pack/plugins/enterprise_search/server/lib/crawler/post_connector.test.ts b/x-pack/plugins/enterprise_search/server/lib/crawler/post_connector.test.ts
@@ -90,6 +90,7 @@ describe('recreateConnectorDocument lib function', () => {
         index_name: 'indexName',
         is_native: false,
         language: '',
+        last_access_control_sync_error: null,
         last_access_control_sync_scheduled_at: null,
         last_access_control_sync_status: null,
         last_incremental_sync_scheduled_at: null,

diff --git a/x-pack/plugins/enterprise_search/server/utils/create_connector_document.test.ts b/x-pack/plugins/enterprise_search/server/utils/create_connector_document.test.ts
@@ -85,6 +85,7 @@ describe('createConnectorDocument', () => {
       index_name: 'indexName',
       is_native: false,
       language: 'fr',
+      last_access_control_sync_error: null,
       last_access_control_sync_scheduled_at: null,
       last_access_control_sync_status: null,
       last_incremental_sync_scheduled_at: null,
@@ -181,6 +182,7 @@ describe('createConnectorDocument', () => {
       index_name: 'search-indexName',
       is_native: false,
       language: 'fr',
+      last_access_control_sync_error: null,
       last_access_control_sync_scheduled_at: null,
       last_access_control_sync_status: null,
       last_incremental_sync_scheduled_at: null,

diff --git a/x-pack/plugins/enterprise_search/server/utils/create_connector_document.ts b/x-pack/plugins/enterprise_search/server/utils/create_connector_document.ts
@@ -114,6 +114,7 @@ export function createConnectorDocument({
     index_name: indexName,
     is_native: isNative,
     language,
+    last_access_control_sync_error: null,
     last_access_control_sync_scheduled_at: null,
     last_access_control_sync_status: null,
     last_incremental_sync_scheduled_at: null,

diff --git a/x-pack/plugins/fleet/common/constants/authz.ts b/x-pack/plugins/fleet/common/constants/authz.ts
@@ -72,6 +72,18 @@ export const ENDPOINT_PRIVILEGES: Record<string, PrivilegeMapObject> = deepFreez
     privilegeType: 'api',
     privilegeName: 'readHostIsolationExceptions',
   },
+  accessHostIsolationExceptions: {
+    appId: DEFAULT_APP_CATEGORIES.security.id,
+    privilegeSplit: '-',
+    privilegeType: 'api',
+    privilegeName: 'accessHostIsolationExceptions',
+  },
+  deleteHostIsolationExceptions: {
+    appId: DEFAULT_APP_CATEGORIES.security.id,
+    privilegeSplit: '-',
+    privilegeType: 'api',
+    privilegeName: 'deleteHostIsolationExceptions',
+  },
   writeBlocklist: {
     appId: DEFAULT_APP_CATEGORIES.security.id,
     privilegeSplit: '-',
@@ -126,6 +138,12 @@ export const ENDPOINT_PRIVILEGES: Record<string, PrivilegeMapObject> = deepFreez
     privilegeType: 'api',
     privilegeName: 'writeHostIsolation',
   },
+  writeHostIsolationRelease: {
+    appId: DEFAULT_APP_CATEGORIES.security.id,
+    privilegeSplit: '-',
+    privilegeType: 'api',
+    privilegeName: 'writeHostIsolationRelease',
+  },
   writeProcessOperations: {
     appId: DEFAULT_APP_CATEGORIES.security.id,
     privilegeSplit: '-',