Skip to content

Commit 84e120d

Browse files
committed
Polishing.
Correctly propagate certificate format. See gh-688
1 parent 978cf7b commit 84e120d

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

spring-vault-core/src/main/java/org/springframework/vault/core/VaultPkiTemplate.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,15 @@ private static Map<String, Object> createIssueRequest(VaultCertificateRequest ce
181181
if (certificateRequest.isExcludeCommonNameFromSubjectAltNames()) {
182182
request.put("exclude_cn_from_sans", true);
183183
}
184+
185+
if (StringUtils.hasText(certificateRequest.getFormat())) {
186+
request.put("format", certificateRequest.getFormat());
187+
}
188+
189+
if (StringUtils.hasText(certificateRequest.getPrivateKeyFormat())) {
190+
request.put("private_key_format", certificateRequest.getPrivateKeyFormat());
191+
}
192+
184193
return request;
185194
}
186195

spring-vault-core/src/test/java/org/springframework/vault/core/VaultPkiTemplateIntegrationTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,9 @@ void issueCertificateShouldCreateCertificate() throws KeyStoreException {
159159
void issueCertificateUsingFormat(KeyFixture keyFixture) throws Exception {
160160

161161
VaultCertificateRequest request = VaultCertificateRequest.builder()
162-
.commonName(keyFixture.format.replace('_', '-') + ".hello.example.com").format(keyFixture.format)
162+
.commonName(keyFixture.format.replace('_', '-') + ".hello.example.com")
163+
.privateKeyFormat(keyFixture.privateKeyFormat)
164+
.format(keyFixture.format)
163165
.build();
164166

165167
VaultCertificateResponse certificateResponse = this.pkiOperations

0 commit comments

Comments
 (0)