Skip to content

Comments

[8.19] [ska] relocate 'shared/lib/security' helpers to 'osquery/cypress' dir (#225438)#226803

Merged
dmlemeshko merged 2 commits intoelastic:8.19from
dmlemeshko:backport/8.19/pr-225438
Jul 8, 2025
Merged

[8.19] [ska] relocate 'shared/lib/security' helpers to 'osquery/cypress' dir (#225438)#226803
dmlemeshko merged 2 commits intoelastic:8.19from
dmlemeshko:backport/8.19/pr-225438

Conversation

@dmlemeshko
Copy link
Contributor

Backport

This will backport the following commits from main to 8.19:

Questions ?

Please refer to the Backport tool documentation

@dmlemeshko dmlemeshko requested a review from kibanamachine as a code owner July 7, 2025 13:00
@dmlemeshko dmlemeshko added the backport This PR is a backport of another PR label Jul 7, 2025
@dmlemeshko dmlemeshko enabled auto-merge (squash) July 7, 2025 13:00
@dmlemeshko dmlemeshko requested a review from fake-haris July 7, 2025 13:00
import * as path from 'path';
import { cloneDeep, merge } from 'lodash';
import { FeaturesPrivileges, Role, RoleIndexPrivilege } from '@kbn/security-plugin/common';
import type { FeaturesPrivileges, Role, RoleIndexPrivilege } from '@kbn/security-plugin/common';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you sure you need to import the type here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

import { KbnClient } from '@kbn/test';
import { Role } from '@kbn/security-plugin/common';
import { ToolingLog } from '@kbn/tooling-log';
import type { KbnClient } from '@kbn/test';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same for these imports

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

…elastic#225438)

## Summary

This PR removes `kbn/test-suites-serverless` as kbn reference for
osquery/cypress test-helper module in order to fix circular dependency I
faced in elastic#225377

Since the main consumer of that `shared/lib/security` code is
`osquery/cypress` test module, I believe it is a resonable change in
order to unblock us relocating tests from `x-pack/test` dir.

(cherry picked from commit 10cc7b3)
@dmlemeshko dmlemeshko force-pushed the backport/8.19/pr-225438 branch from d581e45 to f888edd Compare July 8, 2025 07:44
@dmlemeshko dmlemeshko merged commit c8319c9 into elastic:8.19 Jul 8, 2025
8 checks passed
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

Unknown metric groups

ESLint disabled in files

id before after diff
@kbn/test-suites-serverless 1 0 -1
osquery 0 1 +1
total -0

Total ESLint disabled count

id before after diff
@kbn/test-suites-serverless 2 1 -1
osquery 117 118 +1
total -0

History

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants