Skip to content

Commit a03afe2

Browse files
Get Role Mappings optional roles field (#2474) (#2475)
The roles is optional the same way as role_templates is. ES in both 7.17 https://github.com/elastic/elasticsearch/blob/92f290e9537478f85ff3fe3ab39945c1a49a[…]k/core/security/authc/support/mapper/ExpressionRoleMapping.java and master (8.13) https://github.com/elastic/elasticsearch/blob/09df99393193b2c53d92899662a8b8b3c55b[…]k/core/security/authc/support/mapper/ExpressionRoleMapping.java would only show the roles and roles_templates fields in the response if they are non-empty. (cherry picked from commit 591a05e) Authored-by: Albert Zaharovits <[email protected]>
1 parent bec78a0 commit a03afe2

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

specification/security/_types/RoleMapping.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ import { RoleTemplate } from './RoleTemplate'
2525
export class RoleMapping {
2626
enabled: boolean
2727
metadata: Metadata
28-
roles: string[]
29-
rules: RoleMappingRule
28+
// Exactly one of roles or role_templates should be set
29+
roles?: string[]
30+
// Exactly one of roles or role_templates should be set
3031
role_templates?: RoleTemplate[]
32+
rules: RoleMappingRule
3133
}

specification/security/put_role_mapping/SecurityPutRoleMappingRequest.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ export interface Request extends RequestBase {
3737
body: {
3838
enabled?: boolean
3939
metadata?: Metadata
40+
// Exactly one of roles or role_templates must be specified
4041
roles?: string[]
42+
// Exactly one of roles or role_templates must be specified
4143
role_templates?: RoleTemplate[]
4244
rules?: RoleMappingRule
4345
run_as?: string[]

0 commit comments

Comments
 (0)