Download certs from security plugin instead of storing local copy

Signed-off-by: Craig Perkins <cwperx@amazon.com>
opensearch-project · Nov 5, 2024 · 80e91ef · 80e91ef
1 parent 5cfdc3c
commit 80e91ef
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 27 deletions.
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -14,6 +14,7 @@ plugins {
     id 'jacoco'
     id 'java-library'
     id 'com.diffplug.spotless' version '6.25.0'
+    id 'de.undercouch.download' version '5.3.0'
 }
 
 ext {
@@ -29,6 +30,20 @@ ext {
     projectSubstitutions = [:]
     licenseFile = rootProject.file('LICENSE.txt')
     noticeFile = rootProject.file('NOTICE')
+
+    ['sample.pem', 'test-kirk.jks'].forEach { file ->
+        File local = getLayout().getBuildDirectory().file(file).get().getAsFile()
+        download.run {
+            src "https://raw.githubusercontent.com/opensearch-project/security/refs/heads/main/bwc-test/src/test/resources/security/" + file
+            dest local
+            overwrite false
+        }
+    }
+
+    processTestResources {
+        from(getLayout().getBuildDirectory().file('sample.pem').get().getAsFile())
+        from(getLayout().getBuildDirectory().file('test-kirk.jks').get().getAsFile())
+    }
 }
 
 java {

diff --git a/plugin/src/test/java/org/opensearch/ml/bwc/MLCommonsBackwardsCompatibilityRestTestCase.java b/plugin/src/test/java/org/opensearch/ml/bwc/MLCommonsBackwardsCompatibilityRestTestCase.java
@@ -157,7 +157,7 @@ protected RestClient buildClient(Settings settings, HttpHost[] hosts) throws IOE
             if (Objects.nonNull(keystore)) {
                 URI uri = null;
                 try {
-                    uri = this.getClass().getClassLoader().getResource("security/sample.pem").toURI();
+                    uri = this.getClass().getClassLoader().getResource("sample.pem").toURI();
                 } catch (URISyntaxException e) {
                     throw new RuntimeException(e);
                 }

diff --git a/plugin/src/test/java/org/opensearch/ml/rest/MLCommonsRestTestCase.java b/plugin/src/test/java/org/opensearch/ml/rest/MLCommonsRestTestCase.java
@@ -235,7 +235,7 @@ protected RestClient buildClient(Settings settings, HttpHost[] hosts) throws IOE
             if (Objects.nonNull(keystore)) {
                 URI uri = null;
                 try {
-                    uri = this.getClass().getClassLoader().getResource("security/sample.pem").toURI();
+                    uri = this.getClass().getClassLoader().getResource("sample.pem").toURI();
                 } catch (URISyntaxException e) {
                     throw new RuntimeException(e);
                 }

diff --git a/plugin/src/test/resources/security/sample.pem b/plugin/src/test/resources/security/sample.pem
diff --git a/plugin/src/test/resources/security/test-kirk.jks b/plugin/src/test/resources/security/test-kirk.jks