Merge branch 'master' into copy-pass-3

src/core/server/http/router/socket.test.ts

@@ -92,7 +92,7 @@ describe('KibanaSocket', () => {
       });
       const socket = new KibanaSocket(tlsSocket);
 
-      expect(socket.renegotiate({})).resolves.toBe(result);
+      await expect(socket.renegotiate({})).rejects.toBe(result);
       expect(spy).toBeCalledTimes(1);
     });
 

src/core/server/saved_objects/migrationsv2/README.md

@@ -36,7 +36,7 @@
   - [REINDEX_SOURCE_TO_TEMP_READ](#reindex_source_to_temp_read)
     - [Next action](#next-action-11)
     - [New control state](#new-control-state-11)
-  - [REINDEX_SOURCE_TO_TEMP_INDEX](#reindex_source_to_temp_index)
+  - [REINDEX_SOURCE_TO_TEMP_TRANSFORM](#REINDEX_SOURCE_TO_TEMP_TRANSFORM)
     - [Next action](#next-action-12)
     - [New control state](#new-control-state-12)
   - [REINDEX_SOURCE_TO_TEMP_INDEX_BULK](#reindex_source_to_temp_index_bulk)
@@ -284,11 +284,11 @@ Read the next batch of outdated documents from the source index by using search
 
 ### New control state
 1. If the batch contained > 0 documents
-  → `REINDEX_SOURCE_TO_TEMP_INDEX`
+  → `REINDEX_SOURCE_TO_TEMP_TRANSFORM`
 2. If there are no more documents returned
   → `REINDEX_SOURCE_TO_TEMP_CLOSE_PIT`
 
-## REINDEX_SOURCE_TO_TEMP_INDEX
+## REINDEX_SOURCE_TO_TEMP_TRANSFORM
 ### Next action
 `transformRawDocs`
 
@@ -357,7 +357,7 @@ documents.
 If another instance has a disabled plugin it will reindex that plugin's
 documents without transforming them. Because this instance doesn't know which
 plugins were disabled by the instance that performed the
-`REINDEX_SOURCE_TO_TEMP_INDEX` step, we need to search for outdated documents
+`REINDEX_SOURCE_TO_TEMP_TRANSFORM` step, we need to search for outdated documents
 and transform them to ensure that everything is up to date.
 
 ### New control state

src/core/server/saved_objects/migrationsv2/migrations_state_action_machine.ts

@@ -13,7 +13,7 @@ import type { ElasticsearchClient } from '../../elasticsearch';
 import { getErrorMessage, getRequestDebugMeta } from '../../elasticsearch';
 import { Model, Next, stateActionMachine } from './state_action_machine';
 import { cleanup } from './migrations_state_machine_cleanup';
-import { ReindexSourceToTempIndex, ReindexSourceToTempIndexBulk, State } from './types';
+import { ReindexSourceToTempTransform, ReindexSourceToTempIndexBulk, State } from './types';
 import { SavedObjectsRawDoc } from '../serialization';
 
 interface StateTransitionLogMeta extends LogMeta {
@@ -115,7 +115,9 @@ export async function migrationStateActionMachine({
         const redactedNewState = {
           ...newState,
           ...{
-            outdatedDocuments: ((newState as ReindexSourceToTempIndex).outdatedDocuments ?? []).map(
+            outdatedDocuments: (
+              (newState as ReindexSourceToTempTransform).outdatedDocuments ?? []
+            ).map(
               (doc) =>
                 ({
                   _id: doc._id,

src/core/server/saved_objects/migrationsv2/model/model.test.ts

@@ -20,7 +20,7 @@ import type {
   ReindexSourceToTempOpenPit,
   ReindexSourceToTempRead,
   ReindexSourceToTempClosePit,
-  ReindexSourceToTempIndex,
+  ReindexSourceToTempTransform,
   RefreshTarget,
   UpdateTargetMappingsState,
   UpdateTargetMappingsWaitForTaskState,
@@ -962,16 +962,16 @@ describe('migrations v2 model', () => {
         progress: createInitialProgress(),
       };
 
-      it('REINDEX_SOURCE_TO_TEMP_READ -> REINDEX_SOURCE_TO_TEMP_INDEX if the index has outdated documents to reindex', () => {
+      it('REINDEX_SOURCE_TO_TEMP_READ -> REINDEX_SOURCE_TO_TEMP_TRANSFORM if the index has outdated documents to reindex', () => {
         const outdatedDocuments = [{ _id: '1', _source: { type: 'vis' } }];
         const lastHitSortValue = [123456];
         const res: ResponseType<'REINDEX_SOURCE_TO_TEMP_READ'> = Either.right({
           outdatedDocuments,
           lastHitSortValue,
           totalHits: 1,
         });
-        const newState = model(state, res) as ReindexSourceToTempIndex;
-        expect(newState.controlState).toBe('REINDEX_SOURCE_TO_TEMP_INDEX');
+        const newState = model(state, res) as ReindexSourceToTempTransform;
+        expect(newState.controlState).toBe('REINDEX_SOURCE_TO_TEMP_TRANSFORM');
         expect(newState.outdatedDocuments).toBe(outdatedDocuments);
         expect(newState.lastHitSortValue).toBe(lastHitSortValue);
         expect(newState.progress.processed).toBe(undefined);
@@ -1032,16 +1032,16 @@ describe('migrations v2 model', () => {
 
       it('REINDEX_SOURCE_TO_TEMP_CLOSE_PIT -> SET_TEMP_WRITE_BLOCK if action succeeded', () => {
         const res: ResponseType<'REINDEX_SOURCE_TO_TEMP_CLOSE_PIT'> = Either.right({});
-        const newState = model(state, res) as ReindexSourceToTempIndex;
+        const newState = model(state, res) as ReindexSourceToTempTransform;
         expect(newState.controlState).toBe('SET_TEMP_WRITE_BLOCK');
         expect(newState.sourceIndex).toEqual(state.sourceIndex);
       });
     });
 
-    describe('REINDEX_SOURCE_TO_TEMP_INDEX', () => {
-      const state: ReindexSourceToTempIndex = {
+    describe('REINDEX_SOURCE_TO_TEMP_TRANSFORM', () => {
+      const state: ReindexSourceToTempTransform = {
         ...baseState,
-        controlState: 'REINDEX_SOURCE_TO_TEMP_INDEX',
+        controlState: 'REINDEX_SOURCE_TO_TEMP_TRANSFORM',
         outdatedDocuments: [],
         versionIndexReadyActions: Option.none,
         sourceIndex: Option.some('.kibana') as Option.Some<string>,
@@ -1059,8 +1059,8 @@ describe('migrations v2 model', () => {
         },
       ] as SavedObjectsRawDoc[];
 
-      it('REINDEX_SOURCE_TO_TEMP_INDEX -> REINDEX_SOURCE_TO_TEMP_INDEX_BULK if action succeeded', () => {
-        const res: ResponseType<'REINDEX_SOURCE_TO_TEMP_INDEX'> = Either.right({
+      it('REINDEX_SOURCE_TO_TEMP_TRANSFORM -> REINDEX_SOURCE_TO_TEMP_INDEX_BULK if action succeeded', () => {
+        const res: ResponseType<'REINDEX_SOURCE_TO_TEMP_TRANSFORM'> = Either.right({
           processedDocs,
         });
         const newState = model(state, res) as ReindexSourceToTempIndexBulk;
@@ -1071,7 +1071,7 @@ describe('migrations v2 model', () => {
       });
 
       it('increments the progress.processed counter', () => {
-        const res: ResponseType<'REINDEX_SOURCE_TO_TEMP_INDEX'> = Either.right({
+        const res: ResponseType<'REINDEX_SOURCE_TO_TEMP_TRANSFORM'> = Either.right({
           processedDocs,
         });
 
@@ -1089,24 +1089,24 @@ describe('migrations v2 model', () => {
         expect(newState.progress.processed).toBe(2);
       });
 
-      it('REINDEX_SOURCE_TO_TEMP_INDEX -> REINDEX_SOURCE_TO_TEMP_READ if action succeeded but we have carried through previous failures', () => {
-        const res: ResponseType<'REINDEX_SOURCE_TO_TEMP_INDEX'> = Either.right({
+      it('REINDEX_SOURCE_TO_TEMP_TRANSFORM -> REINDEX_SOURCE_TO_TEMP_READ if action succeeded but we have carried through previous failures', () => {
+        const res: ResponseType<'REINDEX_SOURCE_TO_TEMP_TRANSFORM'> = Either.right({
           processedDocs,
         });
         const testState = {
           ...state,
           corruptDocumentIds: ['a:b'],
           transformErrors: [],
         };
-        const newState = model(testState, res) as ReindexSourceToTempIndex;
+        const newState = model(testState, res) as ReindexSourceToTempTransform;
         expect(newState.controlState).toEqual('REINDEX_SOURCE_TO_TEMP_READ');
         expect(newState.corruptDocumentIds.length).toEqual(1);
         expect(newState.transformErrors.length).toEqual(0);
         expect(newState.progress.processed).toBe(0);
       });
 
-      it('REINDEX_SOURCE_TO_TEMP_INDEX -> REINDEX_SOURCE_TO_TEMP_READ when response is left documents_transform_failed', () => {
-        const res: ResponseType<'REINDEX_SOURCE_TO_TEMP_INDEX'> = Either.left({
+      it('REINDEX_SOURCE_TO_TEMP_TRANSFORM -> REINDEX_SOURCE_TO_TEMP_READ when response is left documents_transform_failed', () => {
+        const res: ResponseType<'REINDEX_SOURCE_TO_TEMP_TRANSFORM'> = Either.left({
           type: 'documents_transform_failed',
           corruptDocumentIds: ['a:b'],
           transformErrors: [],

src/core/server/saved_objects/migrationsv2/model/model.ts

@@ -446,7 +446,7 @@ export const model = (currentState: State, resW: ResponseType<AllActionStates>):
       if (res.right.outdatedDocuments.length > 0) {
         return {
           ...stateP,
-          controlState: 'REINDEX_SOURCE_TO_TEMP_INDEX',
+          controlState: 'REINDEX_SOURCE_TO_TEMP_TRANSFORM',
           outdatedDocuments: res.right.outdatedDocuments,
           lastHitSortValue: res.right.lastHitSortValue,
           progress,
@@ -489,11 +489,11 @@ export const model = (currentState: State, resW: ResponseType<AllActionStates>):
     } else {
       throwBadResponse(stateP, res);
     }
-  } else if (stateP.controlState === 'REINDEX_SOURCE_TO_TEMP_INDEX') {
+  } else if (stateP.controlState === 'REINDEX_SOURCE_TO_TEMP_TRANSFORM') {
     // We follow a similar control flow as for
     // outdated document search -> outdated document transform -> transform documents bulk index
     // collecting issues along the way rather than failing
-    // REINDEX_SOURCE_TO_TEMP_INDEX handles the document transforms
+    // REINDEX_SOURCE_TO_TEMP_TRANSFORM handles the document transforms
     const res = resW as ExcludeRetryableEsError<ResponseType<typeof stateP.controlState>>;
 
     // Increment the processed documents, no matter what the results are.

src/core/server/saved_objects/migrationsv2/next.ts

@@ -12,7 +12,7 @@ import type {
   ReindexSourceToTempOpenPit,
   ReindexSourceToTempRead,
   ReindexSourceToTempClosePit,
-  ReindexSourceToTempIndex,
+  ReindexSourceToTempTransform,
   MarkVersionIndexReady,
   InitState,
   LegacyCreateReindexTargetState,
@@ -105,7 +105,7 @@ export const nextActionMap = (client: ElasticsearchClient, transformRawDocs: Tra
       }),
     REINDEX_SOURCE_TO_TEMP_CLOSE_PIT: (state: ReindexSourceToTempClosePit) =>
       Actions.closePit({ client, pitId: state.sourceIndexPitId }),
-    REINDEX_SOURCE_TO_TEMP_INDEX: (state: ReindexSourceToTempIndex) =>
+    REINDEX_SOURCE_TO_TEMP_TRANSFORM: (state: ReindexSourceToTempTransform) =>
       Actions.transformDocs({ transformRawDocs, outdatedDocuments: state.outdatedDocuments }),
     REINDEX_SOURCE_TO_TEMP_INDEX_BULK: (state: ReindexSourceToTempIndexBulk) =>
       Actions.bulkOverwriteTransformedDocuments({

src/core/server/saved_objects/migrationsv2/types.ts

@@ -233,8 +233,8 @@ export interface ReindexSourceToTempClosePit extends PostInitState {
   readonly sourceIndexPitId: string;
 }
 
-export interface ReindexSourceToTempIndex extends PostInitState {
-  readonly controlState: 'REINDEX_SOURCE_TO_TEMP_INDEX';
+export interface ReindexSourceToTempTransform extends PostInitState {
+  readonly controlState: 'REINDEX_SOURCE_TO_TEMP_TRANSFORM';
   readonly outdatedDocuments: SavedObjectsRawDoc[];
   readonly sourceIndexPitId: string;
   readonly lastHitSortValue: number[] | undefined;
@@ -434,7 +434,7 @@ export type State = Readonly<
   | ReindexSourceToTempOpenPit
   | ReindexSourceToTempRead
   | ReindexSourceToTempClosePit
-  | ReindexSourceToTempIndex
+  | ReindexSourceToTempTransform
   | ReindexSourceToTempIndexBulk
   | SetTempWriteBlock
   | CloneTempToSource

src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.ts

@@ -72,7 +72,7 @@ export class VegaMapView extends VegaBaseView {
     const { zoom, maxZoom, minZoom } = validateZoomSettings(
       this._parser.mapConfig,
       defaults,
-      this.onWarn
+      this.onWarn.bind(this)
     );
     const { signals } = this._vegaStateRestorer.restore() || {};
 

x-pack/plugins/cases/common/api/cases/case.ts

@@ -87,8 +87,11 @@ const CaseBasicRt = rt.type({
   owner: rt.string,
 });
 
-export const CaseExternalServiceBasicRt = rt.type({
-  connector_id: rt.union([rt.string, rt.null]),
+/**
+ * This represents the push to service UserAction. It lacks the connector_id because that is stored in a different field
+ * within the user action object in the API response.
+ */
+export const CaseUserActionExternalServiceRt = rt.type({
   connector_name: rt.string,
   external_id: rt.string,
   external_title: rt.string,
@@ -97,7 +100,14 @@ export const CaseExternalServiceBasicRt = rt.type({
   pushed_by: UserRT,
 });
 
-const CaseFullExternalServiceRt = rt.union([CaseExternalServiceBasicRt, rt.null]);
+export const CaseExternalServiceBasicRt = rt.intersection([
+  rt.type({
+    connector_id: rt.union([rt.string, rt.null]),
+  }),
+  CaseUserActionExternalServiceRt,
+]);
+
+export const CaseFullExternalServiceRt = rt.union([CaseExternalServiceBasicRt, rt.null]);
 
 export const CaseAttributesRt = rt.intersection([
   CaseBasicRt,

x-pack/plugins/cases/common/api/cases/user_actions.ts

@@ -34,7 +34,6 @@ const UserActionRt = rt.union([
   rt.literal('push-to-service'),
 ]);
 
-// TO DO change state to status
 const CaseUserActionBasicRT = rt.type({
   action_field: UserActionFieldRt,
   action: UserActionRt,
@@ -51,6 +50,8 @@ const CaseUserActionResponseRT = rt.intersection([
     action_id: rt.string,
     case_id: rt.string,
     comment_id: rt.union([rt.string, rt.null]),
+    new_val_connector_id: rt.union([rt.string, rt.null]),
+    old_val_connector_id: rt.union([rt.string, rt.null]),
   }),
   rt.partial({ sub_case_id: rt.string }),
 ]);

x-pack/plugins/cases/common/api/connectors/index.ts

@@ -84,14 +84,22 @@ export const ConnectorTypeFieldsRt = rt.union([
   ConnectorSwimlaneTypeFieldsRt,
 ]);
 
+/**
+ * This type represents the connector's format when it is encoded within a user action.
+ */
+export const CaseUserActionConnectorRt = rt.intersection([
+  rt.type({ name: rt.string }),
+  ConnectorTypeFieldsRt,
+]);
+
 export const CaseConnectorRt = rt.intersection([
   rt.type({
     id: rt.string,
-    name: rt.string,
   }),
-  ConnectorTypeFieldsRt,
+  CaseUserActionConnectorRt,
 ]);
 
+export type CaseUserActionConnector = rt.TypeOf<typeof CaseUserActionConnectorRt>;
 export type CaseConnector = rt.TypeOf<typeof CaseConnectorRt>;
 export type ConnectorTypeFields = rt.TypeOf<typeof ConnectorTypeFieldsRt>;
 export type ConnectorJiraTypeFields = rt.TypeOf<typeof ConnectorJiraTypeFieldsRt>;

x-pack/plugins/cases/common/index.ts

@@ -12,3 +12,4 @@ export * from './constants';
 export * from './api';
 export * from './ui/types';
 export * from './utils/connectors_api';
+export * from './utils/user_actions';

x-pack/plugins/cases/common/ui/types.ts

@@ -66,7 +66,9 @@ export interface CaseUserActions {
   caseId: string;
   commentId: string | null;
   newValue: string | null;
+  newValConnectorId: string | null;
   oldValue: string | null;
+  oldValConnectorId: string | null;
 }
 
 export interface CaseExternalService {

x-pack/plugins/cases/common/utils/user_actions.ts

@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
+
+export function isCreateConnector(action?: string, actionFields?: string[]): boolean {
+  return action === 'create' && actionFields != null && actionFields.includes('connector');
+}
+
+export function isUpdateConnector(action?: string, actionFields?: string[]): boolean {
+  return action === 'update' && actionFields != null && actionFields.includes('connector');
+}
+
+export function isPush(action?: string, actionFields?: string[]): boolean {
+  return action === 'push-to-service' && actionFields != null && actionFields.includes('pushed');
+}

x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/migrations/index.ts → x-pack/plugins/cases/public/common/user_actions/index.ts

@@ -5,5 +5,4 @@
  * 2.0.
  */
 
-export { timelinesMigrations } from './timelines';
-export { notesMigrations } from './notes';
+export * from './parsers';