@@ -76,13 +76,13 @@ public static Builder builder() {
76
76
*/
77
77
public void install () {
78
78
if (isNullOrNoneOrEmpty (vaultAddress )) {
79
- LOGGER .debug ("Skipping serviceRoles installation, vaultAddress not set" );
79
+ LOGGER .debug ("Skipping service roles installation, vault address not set" );
80
80
return ;
81
81
}
82
82
83
83
final ServiceRoles serviceRoles = loadServiceRoles ();
84
84
if (serviceRoles == null || serviceRoles .roles .isEmpty ()) {
85
- LOGGER .debug ("Skipping serviceRoles installation, serviceRoles not set" );
85
+ LOGGER .debug ("Skipping service roles installation, service roles not set" );
86
86
return ;
87
87
}
88
88
@@ -95,6 +95,7 @@ public void install() {
95
95
final var keyName = keyNameSupplier .get ();
96
96
97
97
createVaultIdentityKey (rest .url (vaultIdentityKeyUri (keyName )), keyName );
98
+ LOGGER .debug ("Vault identity key: {}" , keyName );
98
99
99
100
for (var role : serviceRoles .roles ) {
100
101
final var roleName = roleNameBuilder .apply (role .role );
@@ -103,9 +104,10 @@ public void install() {
103
104
keyName ,
104
105
role .role ,
105
106
role .permissions );
107
+ LOGGER .debug ("Vault identity role: {}" , roleName );
106
108
}
107
109
108
- LOGGER .debug ("Installed serviceRoles ({}) " , serviceRoles );
110
+ LOGGER .debug ("Installed service roles: {} " , serviceRoles );
109
111
})
110
112
.get (timeout , timeUnit );
111
113
} catch (Exception e ) {
@@ -114,10 +116,6 @@ public void install() {
114
116
}
115
117
116
118
private ServiceRoles loadServiceRoles () {
117
- if (serviceRolesSources == null ) {
118
- return null ;
119
- }
120
-
121
119
for (Supplier <ServiceRoles > serviceRolesSource : serviceRolesSources ) {
122
120
final ServiceRoles serviceRoles = serviceRolesSource .get ();
123
121
if (serviceRoles != null ) {
@@ -146,7 +144,6 @@ private void createVaultIdentityKey(Rest rest, String keyName) {
146
144
147
145
try {
148
146
awaitSuccess (rest .body (body ).post ().getStatus ());
149
- LOGGER .debug ("Created vault identity key: {}" , keyName );
150
147
} catch (RestException e ) {
151
148
throw new RuntimeException ("Failed to create vault identity key: " + keyName , e );
152
149
}
@@ -164,7 +161,6 @@ private void createVaultIdentityRole(
164
161
165
162
try {
166
163
awaitSuccess (rest .body (body ).post ().getStatus ());
167
- LOGGER .debug ("Created vault identity role: {}" , roleName );
168
164
} catch (RestException e ) {
169
165
throw new RuntimeException ("Failed to create vault identity role: " + roleName , e );
170
166
}
0 commit comments