Fixed migration issue for case specific actions, by extending email a…

…ction migrator checks (#81673) * Fixed migration issue for case specific actions, by extending email action migrator checks * Fixed e2e test * fixed due to comments
elastic · Oct 27, 2020 · ee7f16e · ee7f16e
1 parent aaa4795
commit ee7f16e
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 20 deletions.
diff --git a/x-pack/plugins/actions/server/saved_objects/migrations.test.ts b/x-pack/plugins/actions/server/saved_objects/migrations.test.ts
@@ -24,7 +24,11 @@ describe('7.10.0', () => {
  test('add hasAuth config property for .email actions', () => {
  const migration710 = getMigrations(encryptedSavedObjectsSetup)['7.10.0'];
  const action = getMockDataForEmail({});
- expect(migration710(action, context)).toMatchObject({
+ const migratedAction = migration710(action, context);
+ expect(migratedAction.attributes.config).toEqual({
+ hasAuth: true,
+ });
+ expect(migratedAction).toEqual({
  ...action,
  attributes: {
  ...action.attributes,
@@ -38,7 +42,11 @@ describe('7.10.0', () => {
  test('rename cases configuration object', () => {
  const migration710 = getMigrations(encryptedSavedObjectsSetup)['7.10.0'];
  const action = getMockData({});
- expect(migration710(action, context)).toMatchObject({
+ const migratedAction = migration710(action, context);
+ expect(migratedAction.attributes.config).toEqual({
+ incidentConfiguration: { mapping: [] },
+ });
+ expect(migratedAction).toEqual({
  ...action,
  attributes: {
  ...action.attributes,

diff --git a/x-pack/plugins/actions/server/saved_objects/migrations.ts b/x-pack/plugins/actions/server/saved_objects/migrations.ts
@@ -70,6 +70,9 @@ function renameCasesConfigurationObject(
 const addHasAuthConfigurationObject = (
  doc: SavedObjectUnsanitizedDoc<RawAction>
 ): SavedObjectUnsanitizedDoc<RawAction> => {
+ if (doc.attributes.actionTypeId !== '.email') {
+ return doc;
+ }
  const hasAuth = !!doc.attributes.secrets.user || !!doc.attributes.secrets.password;
  return {
  ...doc,

diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/migrations.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/migrations.ts
@@ -30,24 +30,29 @@ export default function createGetTests({ getService }: FtrProviderContext) {
  expect(response.status).to.eql(200);
  expect(response.body.config).key('incidentConfiguration');
  expect(response.body.config).not.key('casesConfiguration');
- expect(response.body.config.incidentConfiguration).to.eql({
- mapping: [
- {
- actionType: 'overwrite',
- source: 'title',
- target: 'summary',
- },
- {
- actionType: 'overwrite',
- source: 'description',
- target: 'description',
- },
- {
- actionType: 'append',
- source: 'comments',
- target: 'comments',
- },
- ],
+ expect(response.body.config).to.eql({
+ apiUrl:
+ 'http://elastic:changeme@localhost:5620/api/_actions-FTS-external-service-simulators/jira',
+ incidentConfiguration: {
+ mapping: [
+ {
+ actionType: 'overwrite',
+ source: 'title',
+ target: 'summary',
+ },
+ {
+ actionType: 'overwrite',
+ source: 'description',
+ target: 'description',
+ },
+ {
+ actionType: 'append',
+ source: 'comments',
+ target: 'comments',
+ },
+ ],
+ },
+ projectKey: 'CK',
  });
  });
  });