add support for keystore/truststore to containers

Author: SylvainJuge

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxScraperContainer.java

@@ -8,8 +8,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import java.nio.file.Path;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
@@ -29,6 +32,10 @@ public class JmxScraperContainer extends GenericContainer<JmxScraperContainer> {
   private String password;
   private final List<String> extraJars;
   private boolean testJmx;
+  private Path keyStore;
+  private String keyStorePassword;
+  private Path trustStore;
+  private String trustStorePassword;
 
   public JmxScraperContainer(String otlpEndpoint, String baseImage) {
     super(baseImage);
@@ -112,6 +119,20 @@ public JmxScraperContainer withTestJmx() {
     return this;
   }
 
+  @CanIgnoreReturnValue
+  public JmxScraperContainer withKeyStore(Path keyStore, String password) {
+    this.keyStore = keyStore;
+    this.keyStorePassword = password;
+    return this;
+  }
+
+  @CanIgnoreReturnValue
+  public JmxScraperContainer withTrustStore(Path trustStore, String password) {
+    this.trustStore = trustStore;
+    this.trustStorePassword = password;
+    return this;
+  }
+
   @Override
   public void start() {
     // for now only configure through JVM args
@@ -138,6 +159,9 @@ public void start() {
       arguments.add("-Dotel.jmx.password=" + password);
     }
 
+    arguments.addAll(addKeyStore(keyStore, keyStorePassword, /* keyStore= */ true));
+    arguments.addAll(addKeyStore(trustStore, trustStorePassword, /* keyStore= */ false));
+
     if (!customYamlFiles.isEmpty()) {
       for (String yaml : customYamlFiles) {
         this.withCopyFileToContainer(MountableFile.forClasspathResource(yaml), yaml);
@@ -171,4 +195,15 @@ public void start() {
 
     super.start();
   }
+
+  private List<String> addKeyStore(Path path, String password, boolean keyStore) {
+    if (path == null) {
+      return Collections.emptyList();
+    }
+    String containerPath = "/" + path.getFileName().toString();
+    this.withCopyFileToContainer(MountableFile.forHostPath(path), containerPath);
+
+    String prefix = String.format("-Djavax.net.ssl.%sStore", keyStore ? "key" : "trust");
+    return Arrays.asList(prefix + "=" + containerPath, prefix + "Password=" + password);
+  }
 }

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java

@@ -28,6 +28,10 @@ public class TestAppContainer extends GenericContainer<TestAppContainer> {
   private String login;
   private String pwd;
   private boolean jmxSsl;
+  private Path keyStore;
+  private String keyStorePassword;
+  private Path trustStore;
+  private String trustStorePassword;
 
   public TestAppContainer() {
     super("openjdk:8u272-jre-slim");
@@ -68,6 +72,20 @@ public TestAppContainer withJmxSsl() {
     return this;
   }
 
+  @CanIgnoreReturnValue
+  public TestAppContainer withKeyStore(Path keyStore, String password) {
+    this.keyStore = keyStore;
+    this.keyStorePassword = password;
+    return this;
+  }
+
+  @CanIgnoreReturnValue
+  public TestAppContainer withTrustStore(Path trustStore, String password) {
+    this.trustStore = trustStore;
+    this.trustStorePassword = password;
+    return this;
+  }
+
   @Override
   public void start() {
     properties.put("com.sun.management.jmxremote.ssl", Boolean.toString(jmxSsl));
@@ -86,6 +104,9 @@ public void start() {
       properties.put("com.sun.management.jmxremote.access.file", "/jmx.access");
     }
 
+    addKeyStore(keyStore, keyStorePassword, /* keyStore= */ true, properties);
+    addKeyStore(trustStore, trustStorePassword, /* keyStore= */ false, properties);
+
     String confArgs =
         properties.entrySet().stream()
             .map(
@@ -105,6 +126,19 @@ public void start() {
     super.start();
   }
 
+  private void addKeyStore(
+      Path path, String password, boolean keyStore, Map<String, String> properties) {
+    if (path == null) {
+      return;
+    }
+    String containerPath = "/" + path.getFileName().toString();
+    this.withCopyFileToContainer(MountableFile.forHostPath(path), containerPath);
+
+    String prefix = String.format("javax.net.ssl.%sStore", keyStore ? "key" : "trust");
+    properties.put(prefix, containerPath);
+    properties.put(prefix + "Password", password);
+  }
+
   private static Path createPwdFile(String login, String pwd) {
     try {
       Path path = Files.createTempFile("test", ".pwd");