Skip to content

Commit b1a7b70

Browse files
committed
Enhanced VaultServiceRolesInstaller
1 parent 3055b7c commit b1a7b70

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

vault/src/main/java/io/scalecube/security/vault/VaultServiceRolesInstaller.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void install() {
9393
createVaultIdentityKey(rest.url(vaultIdentityKeyUri(keyName)), keyName);
9494

9595
for (var role : serviceRoles.roles) {
96-
String roleName = roleNameBuilder.apply(role.role);
96+
final var roleName = roleNameBuilder.apply(role.role);
9797
createVaultIdentityRole(
9898
rest.url(vaultIdentityRoleUri(roleName)),
9999
keyName,
@@ -153,7 +153,7 @@ private void createVaultIdentityRole(
153153
final byte[] body =
154154
Json.object()
155155
.add("key", keyName)
156-
.add("template", createTemplate(permissions))
156+
.add("template", createTemplate(roleName, permissions))
157157
.add("ttl", roleTtl)
158158
.toString()
159159
.getBytes();
@@ -166,10 +166,14 @@ private void createVaultIdentityRole(
166166
}
167167
}
168168

169-
private static String createTemplate(List<String> permissions) {
169+
private static String createTemplate(String roleName, List<String> permissions) {
170170
return Base64.getUrlEncoder()
171171
.encodeToString(
172-
Json.object().add("permissions", String.join(",", permissions)).toString().getBytes());
172+
Json.object()
173+
.add("role", roleName)
174+
.add("permissions", String.join(",", permissions))
175+
.toString()
176+
.getBytes());
173177
}
174178

175179
private String vaultIdentityKeyUri(String keyName) {

0 commit comments

Comments
 (0)