diff options
author | Morten Tokle <mortent@verizonmedia.com> | 2021-05-21 14:12:00 +0200 |
---|---|---|
committer | Morten Tokle <mortent@verizonmedia.com> | 2021-05-25 08:01:56 +0200 |
commit | d97430f1bb633fc9eb541f2fb057a41a012d088f (patch) | |
tree | dc057905a336908b768ee67c2c88acbcb83579d3 /config-model | |
parent | 05c8138b4936a3144e8b95348ebc525148ba709f (diff) |
Add top-level object, simplify tests
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index 6649087f454..543318f9224 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -73,6 +73,7 @@ import java.io.StringReader; import java.math.BigInteger; import java.security.KeyPair; import java.security.cert.X509Certificate; +import java.time.Duration; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.ArrayList; @@ -836,14 +837,9 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { .withRoot(applicationFolder.getRoot()) .build(); - KeyPair key = KeyUtils.generateKeypair(KeyAlgorithm.EC, 256); var applicationTrustCert = X509CertificateUtils.toPem( - X509CertificateBuilder - .fromKeypair(key, new X500Principal("CN=application"), Instant.now(), Instant.now().plus(1, ChronoUnit.DAYS), SignatureAlgorithm.SHA512_WITH_ECDSA, BigInteger.valueOf(1)) - .build()); - var operatorCert = X509CertificateBuilder - .fromKeypair(key, new X500Principal("CN=operator"), Instant.now(), Instant.now().plus(1, ChronoUnit.DAYS), SignatureAlgorithm.SHA512_WITH_ECDSA, BigInteger.valueOf(1)) - .build(); + X509CertificateUtils.createSelfSigned("CN=application", Duration.ofDays(1)).certificate()); + var operatorCert = X509CertificateUtils.createSelfSigned("CN=operator", Duration.ofDays(1)).certificate(); applicationPackage.getFile(Path.fromString("security")).createDirectory(); applicationPackage.getFile(Path.fromString("security/clients.pem")).writeFile(new StringReader(applicationTrustCert)); |