Skip to content

Commit 73b0dcb

Browse files
cwperksjainankitk
authored andcommitted
Fix flaky test in SecureReactorNetty4HttpServerTransportTests with reproducible seed (opensearch-project#19327)
Signed-off-by: Craig Perkins <[email protected]> Signed-off-by: Ankit Jain <[email protected]>
1 parent bdc6616 commit 73b0dcb

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5353
- Fix QueryPhaseResultConsumer incomplete callback loops ([#19231](https://github.com/opensearch-project/OpenSearch/pull/19231))
5454
- Fix the `scaled_float` precision issue ([#19188](https://github.com/opensearch-project/OpenSearch/pull/19188))
5555
- Fix Using an excessively large reindex slice can lead to a JVM OutOfMemoryError on coordinator.([#18964](https://github.com/opensearch-project/OpenSearch/pull/18964))
56+
- [Flaky Test] Fix flaky test in SecureReactorNetty4HttpServerTransportTests with reproducible seed ([#19327](https://github.com/opensearch-project/OpenSearch/pull/19327))
5657

5758
### Dependencies
5859
- Bump `com.netflix.nebula.ospackage-base` from 12.0.0 to 12.1.0 ([#19019](https://github.com/opensearch-project/OpenSearch/pull/19019))

test/framework/src/main/java/org/opensearch/test/KeyStoreUtils.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88

99
package org.opensearch.test;
1010

11+
import org.bouncycastle.asn1.x500.X500Name;
12+
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
1113
import org.bouncycastle.cert.X509CertificateHolder;
14+
import org.bouncycastle.cert.X509v1CertificateBuilder;
1215
import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
13-
import org.bouncycastle.cert.jcajce.JcaX509v1CertificateBuilder;
1416
import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
1517

1618
import javax.security.auth.x500.X500Principal;
@@ -22,6 +24,7 @@
2224
import java.security.KeyStore;
2325
import java.security.cert.X509Certificate;
2426
import java.util.Date;
27+
import java.util.Locale;
2528

2629
public class KeyStoreUtils {
2730

@@ -53,13 +56,14 @@ private static X509CertificateHolder generateCert(KeyPair pair) throws Exception
5356
// 10 years in milliseconds
5457
var validityPeriod = 10L * 365 * 24 * 60 * 60 * 1000;
5558

56-
var certBuilder = new JcaX509v1CertificateBuilder(
57-
new X500Principal("CN=Test CA Certificate"),
59+
var certBuilder = new X509v1CertificateBuilder(
60+
X500Name.getInstance(new X500Principal("CN=Test CA Certificate").getEncoded()),
5861
BigInteger.valueOf(1),
5962
new Date(baseTime),
6063
new Date(baseTime + validityPeriod),
61-
new X500Principal("CN=Test CA Certificate"),
62-
pair.getPublic()
64+
Locale.ROOT,
65+
X500Name.getInstance(new X500Principal("CN=Test CA Certificate").getEncoded()),
66+
SubjectPublicKeyInfo.getInstance(pair.getPublic().getEncoded())
6367
);
6468
var signer = new JcaContentSignerBuilder("SHA256withRSA").build(pair.getPrivate());
6569
return certBuilder.build(signer);

0 commit comments

Comments
 (0)