Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moving lease id into body of lease renewal request.

Browse Source 
Original pull request: gh-282.
See gh-262.
This commit is contained in:
Erik Lindblom
2018-08-02 09:02:08 -06:00
committed by Mark Paluch
parent 3489d6ced6
commit 94153a5fcb
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-vault-core/src/main/java/org/springframework/vault/core/lease/SecretLeaseContainer.java
View File

@@ -35,6 +35,7 @@ import lombok.extern.apachecommons.CommonsLog;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -592,11 +593,16 @@ public class SecretLeaseContainer extends SecretLeaseEventPublisher implements
@SuppressWarnings("unchecked")
private Lease renew(Lease lease) {
final Map<String, String> leaseRenewalData = new HashMap<>();
leaseRenewalData.put("lease_id", lease.getLeaseId());
leaseRenewalData.put("increment", Long.toString(lease.getLeaseDuration().getSeconds()));
HttpEntity<Object> leaseRenewalEntity = new HttpEntity<>(leaseRenewalData);
ResponseEntity<Map<String, Object>> entity = operations
.doWithSession(restOperations -> (ResponseEntity) restOperations
.exchange("sys/renew/{leaseId}", HttpMethod.PUT, null, Map.class,
lease.getLeaseId()));
.exchange("sys/renew", HttpMethod.PUT, leaseRenewalEntity, Map.class));
Assert.state(entity != null && entity.getBody() != null,
"Renew response must not be null");