Skip to content

Commit 5e1d6d7

Browse files
[ska] relocate kibana-security FTR tests (#228452)
## Summary Part of elastic/kibana-team#1503 This PR is mostly about moving security FTR tests from x-pack/test ``` x-pack/test/ | - security_api_integration/ | - security_functional/ ``` After: ``` x-pack/platform/test/ | - security_api_integration/ | - security_functional/ ``` This PR also updates FTR configs that load test plugins from relocated paths. --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
1 parent fe4f928 commit 5e1d6d7

178 files changed

Lines changed: 103 additions & 122 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -288,40 +288,40 @@ enabled:
288288
- x-pack/platform/test/saved_object_tagging/functional/config.ts
289289
- x-pack/platform/test/saved_objects_field_count/config.ts
290290
- x-pack/platform/test/search_sessions_integration/config.ts
291-
- x-pack/test/security_api_integration/anonymous_es_anonymous.config.ts
292-
- x-pack/test/security_api_integration/anonymous.config.ts
293-
- x-pack/test/security_api_integration/api_keys.config.ts
294-
- x-pack/test/security_api_integration/audit.config.ts
295-
- x-pack/test/security_api_integration/http_bearer.config.ts
296-
- x-pack/test/security_api_integration/http_no_auth_providers.config.ts
297-
- x-pack/test/security_api_integration/kerberos_anonymous_access.config.ts
298-
- x-pack/test/security_api_integration/kerberos.config.ts
299-
- x-pack/test/security_api_integration/login_selector.config.ts
300-
- x-pack/test/security_api_integration/oidc_implicit_flow.config.ts
301-
- x-pack/test/security_api_integration/oidc.config.ts
302-
- x-pack/test/security_api_integration/oidc.http2.config.ts
303-
- x-pack/test/security_api_integration/pki.config.ts
304-
- x-pack/test/security_api_integration/saml.config.ts
305-
- x-pack/test/security_api_integration/saml.http2.config.ts
306-
- x-pack/test/security_api_integration/saml_cloud.config.ts
307-
- x-pack/test/security_api_integration/chips.config.ts
308-
- x-pack/test/security_api_integration/features.config.ts
309-
- x-pack/test/security_api_integration/session_cookie.config.ts
310-
- x-pack/test/security_api_integration/session_idle.config.ts
311-
- x-pack/test/security_api_integration/session_shard_missing.config.ts
312-
- x-pack/test/security_api_integration/session_invalidate.config.ts
313-
- x-pack/test/security_api_integration/session_lifespan.config.ts
314-
- x-pack/test/security_api_integration/session_concurrent_limit.config.ts
315-
- x-pack/test/security_api_integration/token.config.ts
316-
- x-pack/test/security_api_integration/user_profiles.config.ts
317-
- x-pack/test/security_functional/login_selector.config.ts
318-
- x-pack/test/security_functional/oidc.config.ts
319-
- x-pack/test/security_functional/saml.config.ts
320-
- x-pack/test/security_functional/saml.http2.config.ts
321-
- x-pack/test/security_functional/oidc.http2.config.ts
322-
- x-pack/test/security_functional/insecure_cluster_warning.config.ts
323-
- x-pack/test/security_functional/user_profiles.config.ts
324-
- x-pack/test/security_functional/expired_session.config.ts
291+
- x-pack/platform/test/security_api_integration/anonymous_es_anonymous.config.ts
292+
- x-pack/platform/test/security_api_integration/anonymous.config.ts
293+
- x-pack/platform/test/security_api_integration/api_keys.config.ts
294+
- x-pack/platform/test/security_api_integration/audit.config.ts
295+
- x-pack/platform/test/security_api_integration/http_bearer.config.ts
296+
- x-pack/platform/test/security_api_integration/http_no_auth_providers.config.ts
297+
- x-pack/platform/test/security_api_integration/kerberos_anonymous_access.config.ts
298+
- x-pack/platform/test/security_api_integration/kerberos.config.ts
299+
- x-pack/platform/test/security_api_integration/login_selector.config.ts
300+
- x-pack/platform/test/security_api_integration/oidc_implicit_flow.config.ts
301+
- x-pack/platform/test/security_api_integration/oidc.config.ts
302+
- x-pack/platform/test/security_api_integration/oidc.http2.config.ts
303+
- x-pack/platform/test/security_api_integration/pki.config.ts
304+
- x-pack/platform/test/security_api_integration/saml.config.ts
305+
- x-pack/platform/test/security_api_integration/saml.http2.config.ts
306+
- x-pack/platform/test/security_api_integration/saml_cloud.config.ts
307+
- x-pack/platform/test/security_api_integration/chips.config.ts
308+
- x-pack/platform/test/security_api_integration/features.config.ts
309+
- x-pack/platform/test/security_api_integration/session_cookie.config.ts
310+
- x-pack/platform/test/security_api_integration/session_idle.config.ts
311+
- x-pack/platform/test/security_api_integration/session_shard_missing.config.ts
312+
- x-pack/platform/test/security_api_integration/session_invalidate.config.ts
313+
- x-pack/platform/test/security_api_integration/session_lifespan.config.ts
314+
- x-pack/platform/test/security_api_integration/session_concurrent_limit.config.ts
315+
- x-pack/platform/test/security_api_integration/token.config.ts
316+
- x-pack/platform/test/security_api_integration/user_profiles.config.ts
317+
- x-pack/platform/test/security_functional/login_selector.config.ts
318+
- x-pack/platform/test/security_functional/oidc.config.ts
319+
- x-pack/platform/test/security_functional/saml.config.ts
320+
- x-pack/platform/test/security_functional/saml.http2.config.ts
321+
- x-pack/platform/test/security_functional/oidc.http2.config.ts
322+
- x-pack/platform/test/security_functional/insecure_cluster_warning.config.ts
323+
- x-pack/platform/test/security_functional/user_profiles.config.ts
324+
- x-pack/platform/test/security_functional/expired_session.config.ts
325325
- x-pack/solutions/security/test/session_view/basic/config.ts
326326
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_basic.ts
327327
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_trial.ts

.eslintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2113,8 +2113,8 @@ module.exports = {
21132113
'x-pack/platform/plugins/shared/security/**/*.{js,mjs,ts,tsx}',
21142114
'x-pack/platform/packages/private/security/**/*.{js,mjs,ts,tsx}',
21152115
'x-pack/platform/packages/shared/security/**/*.{js,mjs,ts,tsx}',
2116-
'x-pack/test/security_api_integration/**/*.{js,mjs,ts,tsx}',
2117-
'x-pack/test/security_functional/**/*.{js,mjs,ts,tsx}',
2116+
'x-pack/platform/test/security_api_integration/**/*.{js,mjs,ts,tsx}',
2117+
'x-pack/platform/test/security_functional/**/*.{js,mjs,ts,tsx}',
21182118

21192119
'x-pack/platform/plugins/shared/spaces/**/*.{js,mjs,ts,tsx}',
21202120
'x-pack/platform/test/spaces_api_integration/**/*.{js,mjs,ts,tsx}',

.github/CODEOWNERS

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,6 +1014,13 @@ x-pack/platform/test/plugin_api_integration/plugins/feature_usage_test @elastic/
10141014
x-pack/platform/test/plugin_api_integration/plugins/sample_task_plugin @elastic/response-ops
10151015
x-pack/platform/test/plugin_api_perf/plugins/task_manager_performance @elastic/response-ops
10161016
x-pack/platform/test/saved_object_api_integration/common/plugins/saved_object_test_plugin @elastic/kibana-security
1017+
x-pack/platform/test/security_api_integration/packages/helpers @elastic/kibana-security
1018+
x-pack/platform/test/security_api_integration/plugins/audit_log @elastic/kibana-security
1019+
x-pack/platform/test/security_api_integration/plugins/features_provider @elastic/kibana-security
1020+
x-pack/platform/test/security_api_integration/plugins/oidc_provider @elastic/kibana-security
1021+
x-pack/platform/test/security_api_integration/plugins/saml_provider @elastic/kibana-security
1022+
x-pack/platform/test/security_api_integration/plugins/user_profiles_consumer @elastic/kibana-security
1023+
x-pack/platform/test/security_functional/plugins/test_endpoints @elastic/kibana-security
10171024
x-pack/platform/test/spaces_api_integration/common/plugins/spaces_test_plugin @elastic/kibana-security
10181025
x-pack/platform/test/task_manager_claimer_update_by_query/plugins/sample_task_plugin_mget @elastic/response-ops
10191026
x-pack/platform/test/ui_capabilities/common/plugins/foo_plugin @elastic/kibana-security
@@ -1130,13 +1137,6 @@ x-pack/test
11301137
x-pack/test_serverless
11311138
x-pack/test/plugin_functional/plugins/global_search_test @elastic/kibana-core
11321139
x-pack/test/plugin_functional/plugins/resolver_test @elastic/security-solution
1133-
x-pack/test/security_api_integration/packages/helpers @elastic/kibana-security
1134-
x-pack/test/security_api_integration/plugins/audit_log @elastic/kibana-security
1135-
x-pack/test/security_api_integration/plugins/features_provider @elastic/kibana-security
1136-
x-pack/test/security_api_integration/plugins/oidc_provider @elastic/kibana-security
1137-
x-pack/test/security_api_integration/plugins/saml_provider @elastic/kibana-security
1138-
x-pack/test/security_api_integration/plugins/user_profiles_consumer @elastic/kibana-security
1139-
x-pack/test/security_functional/plugins/test_endpoints @elastic/kibana-security
11401140
####
11411141
## Everything below this line overrides the default assignments for each package.
11421142
## Items lower in the file have higher precedence:
@@ -2152,8 +2152,8 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi
21522152
/x-pack/platform/test/encrypted_saved_objects_api_integration/ @elastic/kibana-security
21532153
/x-pack/platform/test/functional/apps/security/ @elastic/kibana-security
21542154
/x-pack/platform/test/functional/apps/spaces/ @elastic/kibana-security
2155-
/x-pack/test/security_api_integration/ @elastic/kibana-security
2156-
/x-pack/test/security_functional/ @elastic/kibana-security
2155+
/x-pack/platform/test/security_api_integration/ @elastic/kibana-security
2156+
/x-pack/platform/test/security_functional/ @elastic/kibana-security
21572157
/x-pack/platform/test/spaces_api_integration/ @elastic/kibana-security
21582158
/x-pack/platform/test/saved_object_api_integration/ @elastic/kibana-security
21592159
/x-pack/test_serverless/**/test_suites/common/platform_security/ @elastic/kibana-security

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ src/platform/packages/**/package-map.json
148148
**/.synthetics/
149149
**/.journeys/
150150
**/.rca/
151-
x-pack/test/security_api_integration/plugins/audit_log/audit.log
151+
x-pack/platform/test/security_api_integration/plugins/audit_log/audit.log
152152

153153
# ignore FTR temp directory
154154
.ftr

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
"@kbn/apm-utils": "link:src/platform/packages/shared/kbn-apm-utils",
213213
"@kbn/app-link-test-plugin": "link:src/platform/test/plugin_functional/plugins/app_link_test",
214214
"@kbn/application-usage-test-plugin": "link:x-pack/platform/test/usage_collection/plugins/application_usage_test",
215-
"@kbn/audit-log-plugin": "link:x-pack/test/security_api_integration/plugins/audit_log",
215+
"@kbn/audit-log-plugin": "link:x-pack/platform/test/security_api_integration/plugins/audit_log",
216216
"@kbn/automatic-import-plugin": "link:x-pack/platform/plugins/shared/automatic_import",
217217
"@kbn/avc-banner": "link:src/platform/packages/shared/kbn-avc-banner",
218218
"@kbn/banners-plugin": "link:x-pack/platform/plugins/private/banners",
@@ -558,7 +558,7 @@
558558
"@kbn/feature-flags-example-plugin": "link:examples/feature_flags_example",
559559
"@kbn/feature-usage-test-plugin": "link:x-pack/platform/test/plugin_api_integration/plugins/feature_usage_test",
560560
"@kbn/features-plugin": "link:x-pack/platform/plugins/shared/features",
561-
"@kbn/features-provider-plugin": "link:x-pack/test/security_api_integration/plugins/features_provider",
561+
"@kbn/features-provider-plugin": "link:x-pack/platform/test/security_api_integration/plugins/features_provider",
562562
"@kbn/fec-alerts-test-plugin": "link:x-pack/platform/test/functional_execution_context/plugins/alerts",
563563
"@kbn/field-formats-example-plugin": "link:examples/field_formats_example",
564564
"@kbn/field-formats-plugin": "link:src/platform/plugins/shared/field_formats",
@@ -746,7 +746,7 @@
746746
"@kbn/observability-utils-browser": "link:x-pack/solutions/observability/packages/utils-browser",
747747
"@kbn/observability-utils-common": "link:x-pack/solutions/observability/packages/utils-common",
748748
"@kbn/observability-utils-server": "link:x-pack/solutions/observability/packages/utils-server",
749-
"@kbn/oidc-provider-plugin": "link:x-pack/test/security_api_integration/plugins/oidc_provider",
749+
"@kbn/oidc-provider-plugin": "link:x-pack/platform/test/security_api_integration/plugins/oidc_provider",
750750
"@kbn/onechat-browser": "link:x-pack/platform/packages/shared/onechat/onechat-browser",
751751
"@kbn/onechat-common": "link:x-pack/platform/packages/shared/onechat/onechat-common",
752752
"@kbn/onechat-genai-utils": "link:x-pack/platform/packages/shared/onechat/onechat-genai-utils",
@@ -828,7 +828,7 @@
828828
"@kbn/rule-registry-plugin": "link:x-pack/platform/plugins/shared/rule_registry",
829829
"@kbn/runtime-fields-plugin": "link:x-pack/platform/plugins/private/runtime_fields",
830830
"@kbn/safer-lodash-set": "link:src/platform/packages/shared/kbn-safer-lodash-set",
831-
"@kbn/saml-provider-plugin": "link:x-pack/test/security_api_integration/plugins/saml_provider",
831+
"@kbn/saml-provider-plugin": "link:x-pack/platform/test/security_api_integration/plugins/saml_provider",
832832
"@kbn/sample-data-ingest": "link:x-pack/platform/plugins/shared/sample_data_ingest",
833833
"@kbn/sample-task-plugin": "link:x-pack/platform/test/plugin_api_integration/plugins/sample_task_plugin",
834834
"@kbn/sample-task-plugin-update-by-query": "link:x-pack/platform/test/task_manager_claimer_update_by_query/plugins/sample_task_plugin_mget",
@@ -893,7 +893,7 @@
893893
"@kbn/security-solution-side-nav": "link:x-pack/solutions/security/packages/side-nav",
894894
"@kbn/security-solution-storybook-config": "link:x-pack/solutions/security/packages/storybook/config",
895895
"@kbn/security-solution-upselling": "link:x-pack/solutions/security/packages/upselling",
896-
"@kbn/security-test-endpoints-plugin": "link:x-pack/test/security_functional/plugins/test_endpoints",
896+
"@kbn/security-test-endpoints-plugin": "link:x-pack/platform/test/security_functional/plugins/test_endpoints",
897897
"@kbn/security-ui-components": "link:x-pack/platform/packages/private/security/ui_components",
898898
"@kbn/securitysolution-autocomplete": "link:x-pack/solutions/security/packages/kbn-securitysolution-autocomplete",
899899
"@kbn/securitysolution-data-table": "link:x-pack/solutions/security/packages/data-table",
@@ -1057,7 +1057,7 @@
10571057
"@kbn/use-tracked-promise": "link:src/platform/packages/shared/kbn-use-tracked-promise",
10581058
"@kbn/user-profile-components": "link:src/platform/packages/shared/kbn-user-profile-components",
10591059
"@kbn/user-profile-examples-plugin": "link:examples/user_profile_examples",
1060-
"@kbn/user-profiles-consumer-plugin": "link:x-pack/test/security_api_integration/plugins/user_profiles_consumer",
1060+
"@kbn/user-profiles-consumer-plugin": "link:x-pack/platform/test/security_api_integration/plugins/user_profiles_consumer",
10611061
"@kbn/utility-types": "link:src/platform/packages/shared/kbn-utility-types",
10621062
"@kbn/utility-types-jest": "link:src/platform/packages/shared/kbn-utility-types-jest",
10631063
"@kbn/utils": "link:src/platform/packages/shared/kbn-utils",
@@ -1590,7 +1590,7 @@
15901590
"@kbn/scout-oblt": "link:x-pack/solutions/observability/packages/kbn-scout-oblt",
15911591
"@kbn/scout-reporting": "link:src/platform/packages/private/kbn-scout-reporting",
15921592
"@kbn/scout-security": "link:x-pack/solutions/security/packages/kbn-scout-security",
1593-
"@kbn/security-api-integration-helpers": "link:x-pack/test/security_api_integration/packages/helpers",
1593+
"@kbn/security-api-integration-helpers": "link:x-pack/platform/test/security_api_integration/packages/helpers",
15941594
"@kbn/serverless-storybook-config": "link:src/platform/packages/shared/serverless/storybook/config",
15951595
"@kbn/set-map": "link:packages/kbn-set-map",
15961596
"@kbn/shared-ux-card-no-data-mocks": "link:src/platform/packages/shared/shared-ux/card/no_data/mocks",

src/platform/packages/shared/kbn-scout/src/config/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import { resolve } from 'path';
1111
import { REPO_ROOT } from '@kbn/repo-info';
1212

13-
const SECURITY_TEST_PATH = resolve(REPO_ROOT, 'x-pack/test/security_api_integration');
13+
const SECURITY_TEST_PATH = resolve(REPO_ROOT, 'x-pack/platform/test/security_api_integration');
1414

1515
export const SAML_IDP_PLUGIN_PATH = resolve(SECURITY_TEST_PATH, 'plugins/saml_provider');
1616

0 commit comments

Comments
 (0)