Use pass-core-test-config artifact from pass-core for ITs

eclipse-pass · Nov 1, 2024 · e92bc6b · e92bc6b
1 parent 32aa370
commit e92bc6b
Show file tree

Hide file tree

Showing 19 changed files with 118 additions and 35 deletions.
diff --git a/pass-data-client/pom.xml b/pass-data-client/pom.xml
@@ -90,6 +90,13 @@
       <version>${maven-model.version}</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.pass</groupId>
+      <artifactId>pass-core-test-config</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -158,6 +165,8 @@
                 <ignoredUnusedDeclaredDependency>ch.qos.logback:logback-classic</ignoredUnusedDeclaredDependency>
                 <!-- junit-jupiter is a module containing the junit api jars used directly -->
                 <ignoredUnusedDeclaredDependency>org.junit.jupiter:junit-jupiter</ignoredUnusedDeclaredDependency>
+                <!-- Used by ITs via classpath -->
+                <ignoredUnusedDeclaredDependency>org.eclipse.pass:pass-core-test-config::</ignoredUnusedDeclaredDependency>
               </ignoredUnusedDeclaredDependencies>
               <ignoredNonTestScopedDependencies>
                 <ignoredNonTestScopedDependency>ch.qos.logback:logback-classic:</ignoredNonTestScopedDependency>

diff --git a/pass-data-client/src/test/java/org/eclipse/pass/support/client/JsonApiPassClientIT.java b/pass-data-client/src/test/java/org/eclipse/pass/support/client/JsonApiPassClientIT.java
@@ -100,7 +100,7 @@ public class JsonApiPassClientIT {
 
         System.setProperty("pass.core.url", "http://localhost:8080");
         System.setProperty("pass.core.user", "backend");
-        System.setProperty("pass.core.password", "backend");
+        System.setProperty("pass.core.password", "moo");
 
         Logger root = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
         root.setLevel(Level.WARN);
@@ -109,10 +109,15 @@ public class JsonApiPassClientIT {
     @Container
     private static final GenericContainer<?> PASS_CORE_CONTAINER = new GenericContainer<>(PASS_CORE_IMG)
         .withCopyFileToContainer(
-            MountableFile.forHostPath("../pass-core-test-config/"),
-            "/tmp/pass-core-test-config/"
+            MountableFile.forClasspathResource("/saml2/"),
+            "/tmp/saml2/"
         )
-        .withEnv("PASS_CORE_JAVA_OPTS", "-Dspring.config.import=file:/tmp/pass-core-test-config/application-test.yml")
+        .withCopyFileToContainer(
+            MountableFile.forClasspathResource("/application-test.yml"),
+            "/tmp/application-test.yml"
+        )
+        .withEnv("PASS_SAML_PATH", "file:/tmp/")
+        .withEnv("PASS_CORE_JAVA_OPTS", "-Dspring.config.import=file:/tmp/application-test.yml")
         .withCreateContainerCmdModifier(cmd -> {
             cmd.getHostConfig().withPortBindings(new PortBinding(Ports.Binding.bindPort(8080),
                     new ExposedPort(8080)));

diff --git a/pass-deposit-services/deposit-core/pom.xml b/pass-deposit-services/deposit-core/pom.xml
@@ -315,6 +315,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.eclipse.pass</groupId>
+      <artifactId>pass-core-test-config</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/...ices/deposit-core/src/test/java/org/eclipse/pass/deposit/AbstractDepositSubmissionIT.java b/...ices/deposit-core/src/test/java/org/eclipse/pass/deposit/AbstractDepositSubmissionIT.java
@@ -73,7 +73,7 @@
     properties = {
         "pass.client.url=http://localhost:8080",
         "pass.client.user=backend",
-        "pass.client.password=backend"
+        "pass.client.password=moo"
     })
 @Testcontainers
 @DirtiesContext
@@ -95,11 +95,16 @@ public abstract class AbstractDepositSubmissionIT {
     @Container
     protected static final GenericContainer<?> PASS_CORE_CONTAINER = new GenericContainer<>(PASS_CORE_IMG)
         .withCopyFileToContainer(
-            MountableFile.forHostPath("../../pass-core-test-config/"),
-            "/tmp/pass-core-test-config/"
+            MountableFile.forClasspathResource("/saml2/"),
+            "/tmp/saml2/"
         )
-        .withEnv("PASS_CORE_JAVA_OPTS", "-Dspring.config.import=file:/tmp/pass-core-test-config/application-test.yml")
-        .waitingFor(Wait.forHttp("/data/grant").forStatusCode(200).withBasicCredentials("backend", "backend"))
+        .withCopyFileToContainer(
+            MountableFile.forClasspathResource("/application-test.yml"),
+            "/tmp/application-test.yml"
+        )
+        .withEnv("PASS_SAML_PATH", "file:/tmp/")
+        .withEnv("PASS_CORE_JAVA_OPTS", "-Dspring.config.import=file:/tmp/application-test.yml")
+        .waitingFor(Wait.forHttp("/data/grant").forStatusCode(200).withBasicCredentials("backend", "moo"))
         .withExposedPorts(8080);
 
     @Autowired protected SubmissionTestUtil submissionTestUtil;

diff --git a/pass-deposit-services/pom.xml b/pass-deposit-services/pom.xml
@@ -499,6 +499,8 @@
                 <!-- mockito-inline is needed to mock final classes -->
                 <ignoredUnusedDeclaredDependency>org.mockito:mockito-inline:</ignoredUnusedDeclaredDependency>
                 <ignoredUnusedDeclaredDependency>io.awspring.cloud:spring-cloud-aws-starter-s3:</ignoredUnusedDeclaredDependency>
+                <!-- Used by ITs via classpath -->
+                <ignoredUnusedDeclaredDependency>org.eclipse.pass:pass-core-test-config::</ignoredUnusedDeclaredDependency>
               </ignoredUnusedDeclaredDependencies>
               <ignoredNonTestScopedDependencies>
                 <!-- junit-jupiter is a module containing the junit api jars used directly -->

diff --git a/pass-grant-loader/pom.xml b/pass-grant-loader/pom.xml
@@ -173,6 +173,12 @@
         <version>${maven-model.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.pass</groupId>
+        <artifactId>pass-core-test-config</artifactId>
+        <version>${project.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
 
   <build>
@@ -299,6 +305,8 @@
                   <ignoredUnusedDeclaredDependency>org.projectlombok:lombok:</ignoredUnusedDeclaredDependency>
                   <ignoredUnusedDeclaredDependency>org.mockito:mockito-inline:</ignoredUnusedDeclaredDependency>
                   <ignoredUnusedDeclaredDependency>com.oracle.database.jdbc::</ignoredUnusedDeclaredDependency>
+                  <!-- Used by ITs via classpath -->
+                  <ignoredUnusedDeclaredDependency>org.eclipse.pass:pass-core-test-config::</ignoredUnusedDeclaredDependency>
                 </ignoredUnusedDeclaredDependencies>
               </configuration>
             </execution>

diff --git a/pass-grant-loader/src/test/java/org/eclipse/pass/support/grant/AbstractIntegrationTest.java b/pass-grant-loader/src/test/java/org/eclipse/pass/support/grant/AbstractIntegrationTest.java
@@ -61,11 +61,16 @@ public abstract class AbstractIntegrationTest {
     @Container
     protected static final GenericContainer<?> PASS_CORE_CONTAINER = new GenericContainer<>(PASS_CORE_IMG)
         .withCopyFileToContainer(
-            MountableFile.forHostPath("../pass-core-test-config/"),
-            "/tmp/pass-core-test-config/"
+            MountableFile.forClasspathResource("/saml2/"),
+            "/tmp/saml2/"
         )
-        .withEnv("PASS_CORE_JAVA_OPTS", "-Dspring.config.import=file:/tmp/pass-core-test-config/application-test.yml")
-        .waitingFor(Wait.forHttp("/data/grant").forStatusCode(200).withBasicCredentials("backend", "backend"))
+        .withCopyFileToContainer(
+            MountableFile.forClasspathResource("/application-test.yml"),
+            "/tmp/application-test.yml"
+        )
+        .withEnv("PASS_SAML_PATH", "file:/tmp/")
+        .withEnv("PASS_CORE_JAVA_OPTS", "-Dspring.config.import=file:/tmp/application-test.yml")
+        .waitingFor(Wait.forHttp("/data/grant").forStatusCode(200).withBasicCredentials("backend", "moo"))
         .withExposedPorts(8080);
 
     @SpyBean protected PassClient passClient;

diff --git a/pass-grant-loader/src/test/resources/test-application.properties b/pass-grant-loader/src/test/resources/test-application.properties
@@ -3,4 +3,4 @@ pass.grant.update.ts.path=file:./src/test/resources/grant_update_timestamps
 # pass-core properties
 pass.client.url=http://localhost:8080/
 pass.client.user=backend
-pass.client.password=backend
+pass.client.password=moo
diff --git a/pass-journal-loader/pass-journal-loader-nih/pom.xml b/pass-journal-loader/pass-journal-loader-nih/pom.xml
@@ -80,6 +80,13 @@
       <version>${maven-model.version}</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.pass</groupId>
+      <artifactId>pass-core-test-config</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/.../pass-journal-loader-nih/src/test/java/org/eclipse/pass/loader/journal/nih/DepositIT.java b/.../pass-journal-loader-nih/src/test/java/org/eclipse/pass/loader/journal/nih/DepositIT.java
@@ -69,17 +69,22 @@ public class DepositIT {
 
         System.setProperty("pass.core.url", "http://localhost:8080");
         System.setProperty("pass.core.user", "backend");
-        System.setProperty("pass.core.password", "backend");
+        System.setProperty("pass.core.password", "moo");
     }
 
     @Container
     private static final GenericContainer<?> PASS_CORE_CONTAINER = new GenericContainer<>(PASS_CORE_IMG)
         .withCopyFileToContainer(
-            MountableFile.forHostPath("../../pass-core-test-config/"),
-            "/tmp/pass-core-test-config/"
+            MountableFile.forClasspathResource("/saml2/"),
+            "/tmp/saml2/"
         )
-        .withEnv("PASS_CORE_JAVA_OPTS", "-Dspring.config.import=file:/tmp/pass-core-test-config/application-test.yml")
-        .waitingFor(Wait.forHttp("/data/grant").forStatusCode(200).withBasicCredentials("backend", "backend"))
+        .withCopyFileToContainer(
+            MountableFile.forClasspathResource("/application-test.yml"),
+            "/tmp/application-test.yml"
+        )
+        .withEnv("PASS_SAML_PATH", "file:/tmp/")
+        .withEnv("PASS_CORE_JAVA_OPTS", "-Dspring.config.import=file:/tmp/application-test.yml")
+        .waitingFor(Wait.forHttp("/data/grant").forStatusCode(200).withBasicCredentials("backend", "moo"))
         .withCreateContainerCmdModifier(cmd -> {
             cmd.getHostConfig().withPortBindings(new PortBinding(Ports.Binding.bindPort(8080),
                 new ExposedPort(8080)));

diff --git a/pass-journal-loader/pom.xml b/pass-journal-loader/pom.xml
@@ -138,6 +138,8 @@
                 <ignoredUnusedDeclaredDependencies>
                   <!-- junit-jupiter is a module containing the junit api jars used directly -->
                   <ignoredUnusedDeclaredDependency>org.junit.jupiter:junit-jupiter:</ignoredUnusedDeclaredDependency>
+                  <!-- Used by ITs via classpath -->
+                  <ignoredUnusedDeclaredDependency>org.eclipse.pass:pass-core-test-config::</ignoredUnusedDeclaredDependency>
                 </ignoredUnusedDeclaredDependencies>
               </configuration>
             </execution>

diff --git a/pass-nihms-loader/nihms-data-harvest/pom.xml b/pass-nihms-loader/nihms-data-harvest/pom.xml
@@ -110,6 +110,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.eclipse.pass</groupId>
+      <artifactId>pass-core-test-config</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>

diff --git a/pass-nihms-loader/nihms-data-transform-load/pom.xml b/pass-nihms-loader/nihms-data-transform-load/pom.xml
@@ -154,6 +154,12 @@
       <version>${wiremock-version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.pass</groupId>
+      <artifactId>pass-core-test-config</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/...-transform-load/src/test/java/org/eclipse/pass/loader/nihms/NihmsSubmissionEtlITBase.java b/...-transform-load/src/test/java/org/eclipse/pass/loader/nihms/NihmsSubmissionEtlITBase.java
@@ -94,11 +94,16 @@ public abstract class NihmsSubmissionEtlITBase {
     @Container
     protected static final GenericContainer<?> PASS_CORE_CONTAINER = new GenericContainer<>(PASS_CORE_IMG)
         .withCopyFileToContainer(
-            MountableFile.forHostPath("../../pass-core-test-config/"),
-            "/tmp/pass-core-test-config/"
+            MountableFile.forClasspathResource("/saml2/"),
+            "/tmp/saml2/"
         )
-        .withEnv("PASS_CORE_JAVA_OPTS", "-Dspring.config.import=file:/tmp/pass-core-test-config/application-test.yml")
-        .waitingFor(Wait.forHttp("/data/grant").forStatusCode(200).withBasicCredentials("backend", "backend"))
+        .withCopyFileToContainer(
+            MountableFile.forClasspathResource("/application-test.yml"),
+            "/tmp/application-test.yml"
+        )
+        .withEnv("PASS_SAML_PATH", "file:/tmp/")
+        .withEnv("PASS_CORE_JAVA_OPTS", "-Dspring.config.import=file:/tmp/application-test.yml")
+        .waitingFor(Wait.forHttp("/data/grant").forStatusCode(200).withBasicCredentials("backend", "moo"))
         .withExposedPorts(8080);
 
     @DynamicPropertySource

diff --git a/pass-nihms-loader/nihms-data-transform-load/src/test/resources/test-application.properties b/pass-nihms-loader/nihms-data-transform-load/src/test/resources/test-application.properties
@@ -6,4 +6,4 @@ pmc.entrez.service.url=http://localhost:9911/entrez/eutils/esummary.fcgi?db=pubm
 # pass-core properties
 pass.client.url=http://localhost:8080/
 pass.client.user=backend
-pass.client.password=backend
+pass.client.password=moo
diff --git a/pass-nihms-loader/pom.xml b/pass-nihms-loader/pom.xml
@@ -37,11 +37,6 @@
         <junit.jupiter.version>5.10.1</junit.jupiter.version>
         <mockito.version>5.10.0</mockito.version>
         <wiremock.version>3.3.1</wiremock.version>
-        <!-- Properties for integration tests -->
-        <pass.core.port>8080</pass.core.port>
-        <pass.core.url>http://localhost:8080</pass.core.url>
-        <pass.core.user>backend</pass.core.user>
-        <pass.core.password>backend</pass.core.password>
     </properties>
 
     <dependencyManagement>
@@ -218,6 +213,8 @@
                                 <ignoredUnusedDeclaredDependency>ch.qos.logback:logback-classic:</ignoredUnusedDeclaredDependency>
                                 <!-- slf4j is the API used in the code, jcl is used by a transitive dep -->
                                 <ignoredUnusedDeclaredDependency>org.slf4j:jcl-over-slf4j:</ignoredUnusedDeclaredDependency>
+                                <!-- Used by ITs via classpath -->
+                                <ignoredUnusedDeclaredDependency>org.eclipse.pass:pass-core-test-config::</ignoredUnusedDeclaredDependency>
                             </ignoredUnusedDeclaredDependencies>
                             <ignoredNonTestScopedDependencies>
                                 <!-- junit-jupiter is a module containing the junit api jars used directly -->

diff --git a/pass-notification-service/pom.xml b/pass-notification-service/pom.xml
@@ -221,6 +221,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.eclipse.pass</groupId>
+            <artifactId>pass-core-test-config</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -359,6 +366,8 @@
                             <ignoredUnusedDeclaredDependencies>
                                 <!-- slf4j is the API used in the code, logback is the logging provider not used directly -->
                                 <ignoredUnusedDeclaredDependency>ch.qos.logback:logback-classic:</ignoredUnusedDeclaredDependency>
+                                <!-- Used by ITs via classpath -->
+                                <ignoredUnusedDeclaredDependency>org.eclipse.pass:pass-core-test-config::</ignoredUnusedDeclaredDependency>
                             </ignoredUnusedDeclaredDependencies>
                         </configuration>
                     </execution>

diff --git a/...on-service/src/test/java/org/eclipse/pass/notification/service/NotificationServiceIT.java b/...on-service/src/test/java/org/eclipse/pass/notification/service/NotificationServiceIT.java
@@ -65,7 +65,7 @@
 @TestPropertySource(properties = {
     "pass.client.url=http://localhost:8080",
     "pass.client.user=backend",
-    "pass.client.password=backend"
+    "pass.client.password=moo"
 })
 @Testcontainers
 @DirtiesContext
@@ -90,11 +90,16 @@ public class NotificationServiceIT extends AbstractNotificationSpringIntegration
     @Container
     static final GenericContainer<?> PASS_CORE_CONTAINER = new GenericContainer<>(PASS_CORE_IMG)
         .withCopyFileToContainer(
-            MountableFile.forHostPath("../pass-core-test-config/"),
-            "/tmp/pass-core-test-config/"
+            MountableFile.forClasspathResource("/saml2/"),
+            "/tmp/saml2/"
         )
-        .withEnv("PASS_CORE_JAVA_OPTS", "-Dspring.config.import=file:/tmp/pass-core-test-config/application-test.yml")
-        .waitingFor(Wait.forHttp("/data/grant").forStatusCode(200).withBasicCredentials("backend", "backend"))
+        .withCopyFileToContainer(
+            MountableFile.forClasspathResource("/application-test.yml"),
+            "/tmp/application-test.yml"
+        )
+        .withEnv("PASS_SAML_PATH", "file:/tmp/")
+        .withEnv("PASS_CORE_JAVA_OPTS", "-Dspring.config.import=file:/tmp/application-test.yml")
+        .waitingFor(Wait.forHttp("/data/grant").forStatusCode(200).withBasicCredentials("backend", "moo"))
         .withExposedPorts(8080);
 
     @RegisterExtension

diff --git a/pass-notification-service/src/test/resources/test-application.properties b/pass-notification-service/src/test/resources/test-application.properties
@@ -21,7 +21,7 @@ spring.jms.listener.auto-startup=false
 
 pass.client.url=http://localhost:8080/
 pass.client.user=backend
-pass.client.password=backend
+pass.client.password=moo
 
 spring.mail.protocol=smtp
 spring.mail.host=localhost