Fixes

elastic · Jul 22, 2023 · 25a93f0 · 25a93f0
1 parent a54dd07
commit 25a93f0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/x-pack/plugins/actions/server/plugin.test.ts b/x-pack/plugins/actions/server/plugin.test.ts
@@ -579,7 +579,7 @@ describe('Actions Plugin', () => {
  getConfig({
  preconfigured: {
  preconfiguredServerLog: {
- actionTypeId: '.cases',
+ actionTypeId: 'test.system-action',
  name: 'preconfigured-system-action',
  config: {},
  secrets: {},
@@ -593,8 +593,8 @@ describe('Actions Plugin', () => {
  const pluginSetup = await plugin.setup(coreSetup as any, pluginsSetup);
 
  pluginSetup.registerType({
- id: '.cases',
- name: 'Cases',
+ id: 'test.system-action',
+ name: 'Test',
  minimumLicenseRequired: 'platinum',
  supportedFeatureIds: ['alerting'],
  validate: {
@@ -609,7 +609,7 @@ describe('Actions Plugin', () => {
  await expect(async () =>
  plugin.start(coreStart, pluginsStart)
  ).rejects.toThrowErrorMatchingInlineSnapshot(
- `"Setting system action types in preconfigured connectors is not allowed"`
+ `"Setting system action types in preconfigured connectors are not allowed"`
  );
  });
  });

diff --git a/x-pack/plugins/actions/server/plugin.ts b/x-pack/plugins/actions/server/plugin.ts
@@ -624,11 +624,11 @@ export class ActionsPlugin implements Plugin<PluginSetupContract, PluginStartCon
  (connector) => connector.isPreconfigured
  );
 
- const systemActionAsPreconfiguredInConfig = preConfiguredConnectors.some((connector) =>
+ const isSystemActionAsPreconfiguredInConfig = preConfiguredConnectors.some((connector) =>
  this.actionTypeRegistry!.isSystemActionType(connector.actionTypeId)
  );
 
- if (systemActionAsPreconfiguredInConfig) {
+ if (isSystemActionAsPreconfiguredInConfig) {
  throw new Error('Setting system action types in preconfigured connectors are not allowed');
  }
  };

diff --git a/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts b/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
@@ -483,6 +483,7 @@ describe('actions telemetry', () => {
  isDeprecated: false,
  isSystemAction: true,
  secrets: {},
+ config: {},
  },
  ]);
 

diff --git a/x-pack/plugins/alerting/server/application/rule/create/create_rule.test.ts b/x-pack/plugins/alerting/server/application/rule/create/create_rule.test.ts
@@ -1250,6 +1250,7 @@ describe('create()', () => {
  id: '1',
  type: 'alert',
  attributes: {
+ executionStatus: getRuleExecutionStatusPending('2019-02-12T21:01:22.479Z'),
  alertTypeId: '123',
  schedule: { interval: '1m' },
  params: {
@@ -1338,6 +1339,10 @@ describe('create()', () => {
  ],
  "alertTypeId": "123",
  "createdAt": 2019-02-12T21:01:22.479Z,
+ "executionStatus": Object {
+ "lastExecutionDate": 2019-02-12T21:01:22.000Z,
+ "status": "pending",
+ },
  "id": "1",
  "notifyWhen": null,
  "params": Object {
@@ -1392,10 +1397,8 @@ describe('create()', () => {
  enabled: true,
  legacyId: null,
  executionStatus: {
- error: null,
  lastExecutionDate: '2019-02-12T21:01:22.479Z',
  status: 'pending',
- warning: null,
  },
  monitoring: getDefaultMonitoring('2019-02-12T21:01:22.479Z'),
  meta: { versionApiKeyLastmodified: kibanaVersion },