Skip to content

Commit 8c361a0

Browse files
elena-shostakelasticmachine
authored andcommitted
[FTR] Cleaned up check for removed apm_user role (elastic#200679)
## Summary Cleaned up check for removed `apm_user` role, see elastic/elasticsearch#116712 ### Checklist - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [x] The PR description includes the appropriate Release Notes section, and the correct `release_node:*` label is applied per the [guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process) __Closes: https://github.com/elastic/kibana/issues/200666__ --------- Co-authored-by: Elastic Machine <[email protected]>
1 parent abf7efe commit 8c361a0

File tree

4 files changed

+0
-42
lines changed

4 files changed

+0
-42
lines changed

x-pack/test/functional/apps/security/users.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
111111
expect(roles.apm_system.reserved).to.be(true);
112112
expect(roles.apm_system.deprecated).to.be(false);
113113

114-
expect(roles.apm_user.reserved).to.be(true);
115-
expect(roles.apm_user.deprecated).to.be(true);
116-
117114
expect(roles.beats_admin.reserved).to.be(true);
118115
expect(roles.beats_admin.deprecated).to.be(false);
119116

x-pack/test/spaces_api_integration/common/lib/authentication.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@ export const AUTHENTICATION = {
9090
username: 'a_kibana_rbac_space_1_saved_objects_read_user',
9191
password: 'password',
9292
},
93-
APM_USER: {
94-
username: 'a_apm_user',
95-
password: 'password',
96-
},
9793
MACHINE_LEARING_ADMIN: {
9894
username: 'a_machine_learning_admin',
9995
password: 'password',

x-pack/test/spaces_api_integration/common/lib/create_users_and_roles.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -469,16 +469,6 @@ export const createUsersAndRoles = async (es: Client, supertest: SuperTestAgent)
469469
},
470470
});
471471

472-
await es.security.putUser({
473-
username: AUTHENTICATION.APM_USER.username,
474-
body: {
475-
password: AUTHENTICATION.APM_USER.password,
476-
roles: ['apm_user'],
477-
full_name: 'a apm user',
478-
479-
},
480-
});
481-
482472
await es.security.putUser({
483473
username: AUTHENTICATION.MACHINE_LEARING_ADMIN.username,
484474
body: {

x-pack/test/spaces_api_integration/security_and_spaces/apis/get_all.ts

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ export default function getAllSpacesTestSuite({ getService }: FtrProviderContext
5757
legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
5858
dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
5959
dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
60-
apmUser: AUTHENTICATION.APM_USER,
6160
machineLearningAdmin: AUTHENTICATION.MACHINE_LEARING_ADMIN,
6261
machineLearningUser: AUTHENTICATION.MACHINE_LEARNING_USER,
6362
monitoringUser: AUTHENTICATION.MONITORING_USER,
@@ -83,7 +82,6 @@ export default function getAllSpacesTestSuite({ getService }: FtrProviderContext
8382
legacyAll: AUTHENTICATION.KIBANA_LEGACY_USER,
8483
dualAll: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_USER,
8584
dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
86-
apmUser: AUTHENTICATION.APM_USER,
8785
machineLearningAdmin: AUTHENTICATION.MACHINE_LEARING_ADMIN,
8886
machineLearningUser: AUTHENTICATION.MACHINE_LEARNING_USER,
8987
monitoringUser: AUTHENTICATION.MONITORING_USER,
@@ -484,29 +482,6 @@ export default function getAllSpacesTestSuite({ getService }: FtrProviderContext
484482
}
485483
);
486484

487-
getAllTest(`apm_user can't access any spaces from ${scenario.spaceId}`, {
488-
spaceId: scenario.spaceId,
489-
user: scenario.users.apmUser,
490-
tests: {
491-
exists: {
492-
statusCode: 403,
493-
response: expectRbacForbidden,
494-
},
495-
copySavedObjectsPurpose: {
496-
statusCode: 403,
497-
response: expectRbacForbidden,
498-
},
499-
shareSavedObjectsPurpose: {
500-
statusCode: 403,
501-
response: expectRbacForbidden,
502-
},
503-
includeAuthorizedPurposes: {
504-
statusCode: 403,
505-
response: expectRbacForbidden,
506-
},
507-
},
508-
});
509-
510485
getAllTest(`machine_learning_admin can't access any spaces from ${scenario.spaceId}`, {
511486
spaceId: scenario.spaceId,
512487
user: scenario.users.machineLearningAdmin,

0 commit comments

Comments
 (0)