Skip to content

Commit

Permalink
[8.x] [FTR] Merge Alerting Apis from x-pack/test_serverless/shared
Browse files Browse the repository at this point in the history
…into `x-pack/test/api_integration/deployment_agnostic` (#193975) (#197822)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[FTR] Merge Alerting Apis from `x-pack/test_serverless/shared` into
`x-pack/test/api_integration/deployment_agnostic`
(#193975)](#193975)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"Tre","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-09-30T09:41:22Z","message":"[FTR]
Merge Alerting Apis from `x-pack/test_serverless/shared` into
`x-pack/test/api_integration/deployment_agnostic` (#193975)\n\n##
Summary\r\n\r\nFollow up of [this
pr](https://github.com/elastic/kibana/pull/192216),\r\nper
[this\r\ndiscussion](https://github.com/elastic/kibana/pull/192216#discussion_r1760894369).\r\n\r\nAlso,
switch from `svlCommonApi` to `samlAuth` for internal
headers.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine
<[email protected]>\r\nCo-authored-by: Dzmitry
Lemechko
<[email protected]>","sha":"10c337387485d77fd264c11888b2c28131ee515a","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","ci:all-cypress-suites","backport:prev-minor","FTR"],"number":193975,"url":"https://github.com/elastic/kibana/pull/193975","mergeCommit":{"message":"[FTR]
Merge Alerting Apis from `x-pack/test_serverless/shared` into
`x-pack/test/api_integration/deployment_agnostic` (#193975)\n\n##
Summary\r\n\r\nFollow up of [this
pr](https://github.com/elastic/kibana/pull/192216),\r\nper
[this\r\ndiscussion](https://github.com/elastic/kibana/pull/192216#discussion_r1760894369).\r\n\r\nAlso,
switch from `svlCommonApi` to `samlAuth` for internal
headers.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine
<[email protected]>\r\nCo-authored-by: Dzmitry
Lemechko
<[email protected]>","sha":"10c337387485d77fd264c11888b2c28131ee515a"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/193975","number":193975,"mergeCommit":{"message":"[FTR]
Merge Alerting Apis from `x-pack/test_serverless/shared` into
`x-pack/test/api_integration/deployment_agnostic` (#193975)\n\n##
Summary\r\n\r\nFollow up of [this
pr](https://github.com/elastic/kibana/pull/192216),\r\nper
[this\r\ndiscussion](https://github.com/elastic/kibana/pull/192216#discussion_r1760894369).\r\n\r\nAlso,
switch from `svlCommonApi` to `samlAuth` for internal
headers.\r\n\r\n---------\r\n\r\nCo-authored-by: Elastic Machine
<[email protected]>\r\nCo-authored-by: Dzmitry
Lemechko
<[email protected]>","sha":"10c337387485d77fd264c11888b2c28131ee515a"}}]}]
BACKPORT-->
  • Loading branch information
wayneseymour authored Oct 25, 2024
1 parent 6e3ba90 commit a7a2373
Show file tree
Hide file tree
Showing 11 changed files with 910 additions and 1,045 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand Down
Loading

0 comments on commit a7a2373

Please sign in to comment.