[FTR] Merge Alerting Apis from x-pack/test_serverless/shared into `…

…x-pack/test/api_integration/deployment_agnostic` (#193975) ## Summary Follow up of [this pr](#192216), per [this discussion](#192216 (comment)). Also, switch from `svlCommonApi` to `samlAuth` for internal headers. --------- Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Dzmitry Lemechko <[email protected]>
elastic · Sep 30, 2024 · 10c3373 · 10c3373
1 parent abffb37
commit 10c3373
Showing 11 changed files with 910 additions and 1,085 deletions.
diff --git a/...ck/test/api_integration/deployment_agnostic/apis/observability/alerting/burn_rate_rule.ts b/...ck/test/api_integration/deployment_agnostic/apis/observability/alerting/burn_rate_rule.ts
@@ -306,7 +306,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
       });
 
       it('should find the created rule with correct information about the consumer', async () => {
-        const match = await alertingApi.findRule(ruleId, adminRoleAuthc);
+        const match = await alertingApi.findInRules(adminRoleAuthc, ruleId);
         expect(match).not.to.be(undefined);
         expect(match.consumer).to.be(expectedConsumer);
       });

diff --git a/x-pack/test/api_integration/deployment_agnostic/services/alerting_api.ts b/x-pack/test/api_integration/deployment_agnostic/services/alerting_api.ts
diff --git a/...rverless/api_integration/test_suites/observability/custom_threshold_rule/avg_pct_fired.ts b/...rverless/api_integration/test_suites/observability/custom_threshold_rule/avg_pct_fired.ts
@@ -169,7 +169,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should find the created rule with correct information about the consumer', async () => {
-        const match = await alertingApi.findRule(roleAuthc, ruleId);
+        const match = await alertingApi.findInRules(roleAuthc, ruleId);
         expect(match).not.to.be(undefined);
         expect(match.consumer).to.be('observability');
       });

diff --git a/...erless/api_integration/test_suites/observability/custom_threshold_rule/avg_pct_no_data.ts b/...erless/api_integration/test_suites/observability/custom_threshold_rule/avg_pct_no_data.ts
@@ -142,7 +142,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should find the created rule with correct information about the consumer', async () => {
-        const match = await alertingApi.findRule(roleAuthc, ruleId);
+        const match = await alertingApi.findInRules(roleAuthc, ruleId);
         expect(match).not.to.be(undefined);
         expect(match.consumer).to.be('observability');
       });

diff --git a/..._integration/test_suites/observability/custom_threshold_rule/custom_eq_avg_bytes_fired.ts b/..._integration/test_suites/observability/custom_threshold_rule/custom_eq_avg_bytes_fired.ts
@@ -172,7 +172,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should find the created rule with correct information about the consumer', async () => {
-        const match = await alertingApi.findRule(roleAuthc, ruleId);
+        const match = await alertingApi.findInRules(roleAuthc, ruleId);
         expect(match).not.to.be(undefined);
         expect(match.consumer).to.be('observability');
       });

diff --git a/.../api_integration/test_suites/observability/custom_threshold_rule/documents_count_fired.ts b/.../api_integration/test_suites/observability/custom_threshold_rule/documents_count_fired.ts
@@ -170,7 +170,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should find the created rule with correct information about the consumer', async () => {
-        const match = await alertingApi.findRule(roleAuthc, ruleId);
+        const match = await alertingApi.findInRules(roleAuthc, ruleId);
         expect(match).not.to.be(undefined);
         expect(match.consumer).to.be('observability');
       });

diff --git a/...verless/api_integration/test_suites/observability/custom_threshold_rule/group_by_fired.ts b/...verless/api_integration/test_suites/observability/custom_threshold_rule/group_by_fired.ts
@@ -177,7 +177,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should find the created rule with correct information about the consumer', async () => {
-        const match = await alertingApi.findRule(roleAuthc, ruleId);
+        const match = await alertingApi.findInRules(roleAuthc, ruleId);
         expect(match).not.to.be(undefined);
         expect(match.consumer).to.be('observability');
       });

diff --git a/...rverless/api_integration/test_suites/observability/custom_threshold_rule/p99_pct_fired.ts b/...rverless/api_integration/test_suites/observability/custom_threshold_rule/p99_pct_fired.ts
@@ -170,7 +170,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should find the created rule with correct information about the consumer', async () => {
-        const match = await alertingApi.findRule(roleAuthc, ruleId);
+        const match = await alertingApi.findInRules(roleAuthc, ruleId);
         expect(match).not.to.be(undefined);
         expect(match.consumer).to.be('observability');
       });

diff --git a/.../test_serverless/api_integration/test_suites/observability/es_query_rule/es_query_rule.ts b/.../test_serverless/api_integration/test_suites/observability/es_query_rule/es_query_rule.ts
@@ -112,7 +112,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should find the created rule with correct information about the consumer', async () => {
-        const match = await alertingApi.findRule(roleAuthc, ruleId);
+        const match = await alertingApi.findInRules(roleAuthc, ruleId);
         expect(match).not.to.be(undefined);
         expect(match.consumer).to.be('observability');
       });

diff --git a/x-pack/test_serverless/shared/services/alerting_api.ts b/x-pack/test_serverless/shared/services/alerting_api.ts
diff --git a/x-pack/test_serverless/shared/services/deployment_agnostic_services.ts b/x-pack/test_serverless/shared/services/deployment_agnostic_services.ts
@@ -8,12 +8,12 @@
 import _ from 'lodash';
 
 import { services as apiIntegrationServices } from '@kbn/test-suites-xpack/api_integration/services';
-import { AlertingApiProvider } from './alerting_api';
+import { services as apiIntegrationDeploymentAgnosticServices } from '@kbn/test-suites-xpack/api_integration/deployment_agnostic/services';
 /*
  * Some FTR services from api integration stateful tests are compatible with serverless environment
  * While adding a new one, make sure to verify that it works on both Kibana CI and MKI
  */
-const deploymentAgnosticApiIntegrationServices = _.pick(apiIntegrationServices, [
+const pickedServices = _.pick(apiIntegrationServices, [
   'deployment',
   'es',
   'esArchiver',
@@ -34,6 +34,6 @@ const deploymentAgnosticApiIntegrationServices = _.pick(apiIntegrationServices,
 
 export const services = {
   // deployment agnostic FTR services
-  ...deploymentAgnosticApiIntegrationServices,
-  alertingApi: AlertingApiProvider,
+  ...pickedServices,
+  alertingApi: apiIntegrationDeploymentAgnosticServices.alertingApi,
 };