Fixing functional tests

elastic · Aug 25, 2022 · 3c34474 · 3c34474
1 parent 2c86645
commit 3c34474
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/x-pack/plugins/actions/server/builtin_action_types/jira/index.ts b/x-pack/plugins/actions/server/builtin_action_types/jira/index.ts
@@ -83,7 +83,7 @@ export function getActionType(
       },
       secrets: {
         validateSchema: ExternalIncidentServiceSecretConfigurationSchema,
-        validate: validate.config,
+        validate: validate.secrets,
       },
       params: {
         validateSchema: ExecutorParamsSchema,

diff --git a/x-pack/plugins/actions/server/sub_action_framework/validators.test.ts b/x-pack/plugins/actions/server/sub_action_framework/validators.test.ts
@@ -47,21 +47,21 @@ describe('Validators', () => {
     const validator = createValidator(TestSubActionConnector);
     const { config, secrets } = validator;
 
-    expect(config).toEqual(TestConfigSchema);
-    expect(secrets).toEqual(TestSecretsSchema);
+    expect(config).toEqual({ validateSchema: TestConfigSchema });
+    expect(secrets).toEqual({ validateSchema: TestSecretsSchema });
   });
 
   it('should validate the params correctly', async () => {
     const validator = createValidator(TestSubActionConnector);
     const { params } = validator;
-    expect(params.validate({ subAction: 'test', subActionParams: {} }));
+    expect(params.validateSchema.validate({ subAction: 'test', subActionParams: {} }));
   });
 
   it('should allow any field in subActionParams', async () => {
     const validator = createValidator(TestSubActionConnector);
     const { params } = validator;
     expect(
-      params.validate({
+      params.validateSchema.validate({
         subAction: 'test',
         subActionParams: {
           foo: 'foo',
@@ -94,6 +94,6 @@ describe('Validators', () => {
   ])('should throw if the subAction is %p', async (subAction) => {
     const validator = createValidator(TestSubActionConnector);
     const { params } = validator;
-    expect(() => params.validate({ subAction, subActionParams: {} })).toThrow();
+    expect(() => params.validateSchema.validate({ subAction, subActionParams: {} })).toThrow();
   });
 });
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/action_types.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/action_types.ts
@@ -87,9 +87,15 @@ function getIndexRecordActionType() {
     minimumLicenseRequired: 'gold',
     supportedFeatureIds: ['alerting'],
     validate: {
-      params: paramsSchema,
-      config: configSchema,
-      secrets: secretsSchema,
+      params: {
+        validateSchema: paramsSchema,
+      },
+      config: {
+        validateSchema: configSchema,
+      },
+      secrets: {
+        validateSchema: secretsSchema,
+      },
     },
     async executor({ config, secrets, params, services, actionId }) {
       await services.scopedClusterClient.index({
@@ -128,9 +134,15 @@ function getDelayedActionType() {
     minimumLicenseRequired: 'gold',
     supportedFeatureIds: ['alerting'],
     validate: {
-      params: paramsSchema,
-      config: configSchema,
-      secrets: secretsSchema,
+      params: {
+        validateSchema: paramsSchema,
+      },
+      config: {
+        validateSchema: configSchema,
+      },
+      secrets: {
+        validateSchema: secretsSchema,
+      },
     },
     async executor({ config, secrets, params, services, actionId }) {
       await new Promise((resolve) => {
@@ -156,7 +168,9 @@ function getFailingActionType() {
     minimumLicenseRequired: 'gold',
     supportedFeatureIds: ['alerting'],
     validate: {
-      params: paramsSchema,
+      params: {
+        validateSchema: paramsSchema,
+      },
     },
     async executor({ config, secrets, params, services }) {
       await services.scopedClusterClient.index({
@@ -190,7 +204,9 @@ function getRateLimitedActionType() {
     supportedFeatureIds: ['alerting'],
     maxAttempts: 2,
     validate: {
-      params: paramsSchema,
+      params: {
+        validateSchema: paramsSchema,
+      },
     },
     async executor({ config, params, services }) {
       await services.scopedClusterClient.index({
@@ -227,7 +243,9 @@ function getNoAttemptsRateLimitedActionType() {
     supportedFeatureIds: ['alerting'],
     maxAttempts: 0,
     validate: {
-      params: paramsSchema,
+      params: {
+        validateSchema: paramsSchema,
+      },
     },
     async executor({ config, params, services }) {
       await services.scopedClusterClient.index({
@@ -266,7 +284,9 @@ function getAuthorizationActionType(core: CoreSetup<FixtureStartDeps>) {
     minimumLicenseRequired: 'gold',
     supportedFeatureIds: ['alerting'],
     validate: {
-      params: paramsSchema,
+      params: {
+        validateSchema: paramsSchema,
+      },
     },
     async executor({ params, services, actionId }) {
       // Call cluster