diff --git a/pass-core-test-config/application-test.yml b/pass-core-test-config/application-test.yml deleted file mode 100644 index 8bb0dce6..00000000 --- a/pass-core-test-config/application-test.yml +++ /dev/null @@ -1,75 +0,0 @@ -elide: - baseUrl: http://localhost:8080 - aggregation-store: - enabled: false - -PASS_TEST_RESC_PATH: /tmp/pass-core-test-config - -spring: - application: - name: pass-core - artemis: - embedded: - enabled: true - queues: pass-submission,pass-deposit,pass-submission-event - jpa: - hibernate: - dialect: 'org.hibernate.dialect.H2Dialect' - datasource: - url: 'jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE' - username: 'sa' - password: '' - driver-class-name: 'org.h2.Driver' - security: - saml2: - relyingparty: - registration: - pass: - entity-id: https://sp.pass/shibboleth - signing: - credentials: - - private-key-location: file:${PASS_TEST_RESC_PATH}/saml2/sp-key.pem - certificate-location: file:${PASS_TEST_RESC_PATH}/saml2/sp-cert.pem - decryption: - credentials: - - private-key-location: file:${PASS_TEST_RESC_PATH}/saml2/sp-key.pem - certificate-location: file:${PASS_TEST_RESC_PATH}/saml2/sp-cert.pem - acs: - location: "{baseUrl}/login/saml2/sso/{registrationId}" - assertingparty: - metadata-uri: file:${PASS_TEST_RESC_PATH}/saml2/idp-metadata.xml - user: - name: backend - password: backend - -server: - port: 8080 - shutdown: graceful - -logging: - file: - path: ${java.io.tmpdir}/pass-core - -aws: - sqs: - endpoint-override: ${AWS_SQS_ENDPOINT_OVERRIDE:} - -pass: - csp: ${PASS_CORE_APP_CSP:default-src 'self';} - jms: - queue: - submission: pass-submission - deposit: pass-deposit - submission-event: pass-submission-event - sqs: false - embed: true - default-login-success-url: /app/ - login-processing-path: /login/saml2/sso/pass - logout-delete-cookies: JSESSIONID / - logout-success-url: /login - policy: - institution: johnshopkins.edu - institutional_policy_title: "Johns Hopkins University (JHU) Open Access Policy" - institutional_repository_name: JScholarship - usertoken: - key: diff --git a/pass-core-test-config/saml2/idp-metadata.xml b/pass-core-test-config/saml2/idp-metadata.xml deleted file mode 100644 index 3f67c658..00000000 --- a/pass-core-test-config/saml2/idp-metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - MIICmjCCAYICCQDX5sKPsYV3+jANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDAR0ZXN0MB4XDTE5MTIyMzA5MDI1MVoXDTIwMDEyMjA5MDI1MVowDzENMAsGA1UEAwwEdGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMdtDJ278DQTp84O5Nq5F8s5YOR34GFOGI2Swb/3pU7X7918lVljiKv7WVM65S59nJSyXV+fa15qoXLfsdRnq3yw0hTSTs2YDX+jl98kK3ksk3rROfYh1LIgByj4/4NeNpExgeB6rQk5Ay7YS+ARmMzEjXa0favHxu5BOdB2y6WvRQyjPS2lirT/PKWBZc04QZepsZ56+W7bd557tdedcYdY/nKI1qmSQClG2qgslzgqFOv1KCOw43a3mcK/TiiD8IXyLMJNC6OFW3xTL/BG6SOZ3dQ9rjQOBga+6GIaQsDjC4Xp7Kx+FkSvgaw0sJV8gt1mlZy+27Sza6d+hHD2pWECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAm2fk1+gd08FQxK7TL04O8EK1f0bzaGGUxWzlh98a3Dm8+OPhVQRi/KLsFHliLC86lsZQKunYdDB+qd0KUk2oqDG6tstG/htmRYD/S/jNmt8gyPAVi11dHUqW3IvQgJLwxZtoAv6PNs188hvT1WK3VWJ4YgFKYi5XQYnR5sv69Vsr91lYAxyrIlMKahjSW1jTD3ByRfAQghsSLk6fV0OyJHyhuF1TxOVBVf8XOdaqfmvD90JGIPGtfMLPUX4m35qaGAU48PwCL7L3cRHYs9wZWc0ifXZcBENLtHYCLi5txR8c5lyHB9d3AQHzKHMFNjLswn5HsckKg83RH7+eVqHqGw== - - - - - - - MIICmjCCAYICCQDX5sKPsYV3+jANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDAR0ZXN0MB4XDTE5MTIyMzA5MDI1MVoXDTIwMDEyMjA5MDI1MVowDzENMAsGA1UEAwwEdGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMdtDJ278DQTp84O5Nq5F8s5YOR34GFOGI2Swb/3pU7X7918lVljiKv7WVM65S59nJSyXV+fa15qoXLfsdRnq3yw0hTSTs2YDX+jl98kK3ksk3rROfYh1LIgByj4/4NeNpExgeB6rQk5Ay7YS+ARmMzEjXa0favHxu5BOdB2y6WvRQyjPS2lirT/PKWBZc04QZepsZ56+W7bd557tdedcYdY/nKI1qmSQClG2qgslzgqFOv1KCOw43a3mcK/TiiD8IXyLMJNC6OFW3xTL/BG6SOZ3dQ9rjQOBga+6GIaQsDjC4Xp7Kx+FkSvgaw0sJV8gt1mlZy+27Sza6d+hHD2pWECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAm2fk1+gd08FQxK7TL04O8EK1f0bzaGGUxWzlh98a3Dm8+OPhVQRi/KLsFHliLC86lsZQKunYdDB+qd0KUk2oqDG6tstG/htmRYD/S/jNmt8gyPAVi11dHUqW3IvQgJLwxZtoAv6PNs188hvT1WK3VWJ4YgFKYi5XQYnR5sv69Vsr91lYAxyrIlMKahjSW1jTD3ByRfAQghsSLk6fV0OyJHyhuF1TxOVBVf8XOdaqfmvD90JGIPGtfMLPUX4m35qaGAU48PwCL7L3cRHYs9wZWc0ifXZcBENLtHYCLi5txR8c5lyHB9d3AQHzKHMFNjLswn5HsckKg83RH7+eVqHqGw== - - - - - urn:oasis:names:tc:SAML:2.0:nameid-format:transient - - - - Administrator - mailto:na@example.com - - diff --git a/pass-core-test-config/saml2/sp-cert.pem b/pass-core-test-config/saml2/sp-cert.pem deleted file mode 100644 index 71bd521c..00000000 --- a/pass-core-test-config/saml2/sp-cert.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC6zCCAdOgAwIBAgIJAOy0nki3WAOVMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV -BAMTDDc5OTQzZmVlNzg2NTAeFw0xNTEyMTEwMzAwNDJaFw0yNTEyMDgwMzAwNDJa -MBcxFTATBgNVBAMTDDc5OTQzZmVlNzg2NTCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBALPBzAz0DTn+j2YsQKfqWI+m08lP5UzwVsE9ZKzLqO3PRHZqiOBm -EaFmRrYCZCAOcJ0TXcxPGtNSo8HC4uw5/Y5lJGuI3jN7X7KB1VUQDpUSwfgOqtro -uDoVRKrsaYZTnlNV8KbZ0WQz5s4Uw6CxKRB9RZ5iQMP1fuxc8B6GSOb3x69MiY6c -1jlgVAc6rV4zGfpafacxOLM8qcYhY8u3TiSd0H+oiGEqi1mFLK8yp6FKzX8OUkQf -We49YHz6wBxFOe+/p+7ziym1rBs/lGfenEo8ziCIMmjnoo257fz00bcz9rFl1rTx -KLFfgy72xTlG72l6u+pB9VqK3YNJS52Ns5UCAwEAAaM6MDgwFwYDVR0RBBAwDoIM -Nzk5NDNmZWU3ODY1MB0GA1UdDgQWBBRiDMNPjiAMC50WWubI3PMjP45S/DANBgkq -hkiG9w0BAQUFAAOCAQEAYZM/iWgC93vAq0d98egEzvESKodxHffkDOagd4Kxt/S0 -AAHsVQCmAK/9kmRhsWzR3f1KIw98q4EX7nH/K68BFrerUvaL5+fEGE9W6Ki6QdW8 -bM17GQkLyRDKZzGPm/hsaG1Oxru2kDf7qSvv59aRZlZ8skrDEnx8+dZ8JKC02ZDU -ClC+xWl1UPfO2BL4tJei/siSymGpiRqznQ2JMoTFu5CUUpoxyCVz1bl9lCVceoJ9 -FaL38knS0p5DnXcm+I8wqNEVGLDPbDalBQryhJT9fIMm1/B85gB3AWAvcu9PPfHK -lQQUhxyEXTBJx3luLlpIjoloFKIute9K7pE5qAENjg== ------END CERTIFICATE----- \ No newline at end of file diff --git a/pass-core-test-config/saml2/sp-key.pem b/pass-core-test-config/saml2/sp-key.pem deleted file mode 100644 index 8cd45e98..00000000 --- a/pass-core-test-config/saml2/sp-key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCzwcwM9A05/o9m -LECn6liPptPJT+VM8FbBPWSsy6jtz0R2aojgZhGhZka2AmQgDnCdE13MTxrTUqPB -wuLsOf2OZSRriN4ze1+ygdVVEA6VEsH4Dqra6Lg6FUSq7GmGU55TVfCm2dFkM+bO -FMOgsSkQfUWeYkDD9X7sXPAehkjm98evTImOnNY5YFQHOq1eMxn6Wn2nMTizPKnG -IWPLt04kndB/qIhhKotZhSyvMqehSs1/DlJEH1nuPWB8+sAcRTnvv6fu84sptawb -P5Rn3pxKPM4giDJo56KNue389NG3M/axZda08SixX4Mu9sU5Ru9pervqQfVait2D -SUudjbOVAgMBAAECggEBAK0pysTLsZYlmMSHar2XbjrsLecnVTA58ojy+HHRO2nj -mgMs+7CYAvHlUcbyJLwQzQEz787qgWADowb8E5gXASBUZLJGxi738adHlVf9QN7w -k/S/RG3fc+FYLa8uUTV6hfGnv00sVZ9etD/gFthM8c8VrqQ16EgdzWgq25G8MKx1 -dRHT7fRlehiwnuCvUc9dKEkeunaBfDp2QG+jI0aKrjeP+N/0zSyMDiySCr/yIwWn -GmmYdDjNKXullZTDgRn25xfHsQJSVW+RbEFOwALt5+cqecN6NVI53u23XNov8liD -YDkv8sGB1KlJYitGMTEuW21GwOgtjoUkBy83nmHoTAECgYEA5g6fQp3LCFN/c0W9 -Y68RwpQ1SHHCQXIJoajARzLzIqjou29Hgot/waYlFPbiqEI5pPy9cMBMu7LmVyEn -evAPzVheeYrJGeJ1azhdIEQ0e+tLYAQKkVvTPjyfJmtz51g/tSnNzz4HEcOkW5K5 -jkt6UUel61d/JPGL9UbGEt3BtJUCgYEAyAcXn2TG1GOkriD2Q8PjN5tyhmEgJKI2 -LcHULclyJ+Gn2nNCg1EwAn7d/zptdwE+VoijW+VSbrRoZhsRUsh/doPZDtoaInFX -fSsAY9LVeW7flavgliMz3I8zXcoIwOlTY8mZbrFv1jUX+GNRjmeIwpAqTuSOIS1w -UG5P3yQlQwECgYBKHDvBwgM902gjQjwYeLVH8WaYx8zEOHBR24LVbNxWNgODHf3z -V+z3/QXFEyNBANSBCcodIFWXwbHiL5QAToVIqUcF8GeIJyOcPrQBSPd/U/UcITEm -UmZijjTWs5bK1+rt+WGLeXfdiSDRPxr3c+kbdfFFNxKGXCmyAfKc8UMNYQKBgGnG -VleTkxD9IDh0dcWf8KeXLBijg7vbi4rm1KzhudwdGAYMrT+Dzz+ClyJAY2Jq5ewc -lUYjHlQsUoisB50fKUgisMWJ0Agmp30pICupcfmlB9a97SV3uBUKJL+T9s0MlWxP -TzOZ4OoFaYeP/bCwT0GTusu9UOt6e8oMi3AUTSABAoGAAKJh6VI/B4D6piPEKJmA -dOvpDjQoqpKn3arWet6mcrP4ftcIpH/uj2Azp53cAtyszAHhluN7rbcBnXOLePQz -AKAGupEsvFhlLUGoX1+lPfugzIukZKiMl8Koi/66Vf4Dfz4pWhc/oR2TOVZyzqhj -HPxmTTEX5graPtXeDM3hz5A= ------END PRIVATE KEY----- diff --git a/pass-data-client/pom.xml b/pass-data-client/pom.xml index 071733df..6f684357 100644 --- a/pass-data-client/pom.xml +++ b/pass-data-client/pom.xml @@ -90,6 +90,13 @@ ${maven-model.version} test + + + org.eclipse.pass + pass-core-test-config + ${project.parent.version} + test + @@ -158,6 +165,8 @@ ch.qos.logback:logback-classic org.junit.jupiter:junit-jupiter + + org.eclipse.pass:pass-core-test-config:: ch.qos.logback:logback-classic: 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 index 9f08daae..cc2275d5 100644 --- 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 index 2807a601..028841dd 100644 --- a/pass-deposit-services/deposit-core/pom.xml +++ b/pass-deposit-services/deposit-core/pom.xml @@ -315,6 +315,12 @@ test + + org.eclipse.pass + pass-core-test-config + ${project.parent.version} + test + diff --git a/pass-deposit-services/deposit-core/src/test/java/org/eclipse/pass/deposit/AbstractDepositSubmissionIT.java b/pass-deposit-services/deposit-core/src/test/java/org/eclipse/pass/deposit/AbstractDepositSubmissionIT.java index 7cafac00..f707a921 100644 --- a/pass-deposit-services/deposit-core/src/test/java/org/eclipse/pass/deposit/AbstractDepositSubmissionIT.java +++ b/pass-deposit-services/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 index 22803848..fc2d06b5 100644 --- a/pass-deposit-services/pom.xml +++ b/pass-deposit-services/pom.xml @@ -499,6 +499,8 @@ org.mockito:mockito-inline: io.awspring.cloud:spring-cloud-aws-starter-s3: + + org.eclipse.pass:pass-core-test-config:: diff --git a/pass-grant-loader/pom.xml b/pass-grant-loader/pom.xml index 43dfa603..a5661958 100644 --- a/pass-grant-loader/pom.xml +++ b/pass-grant-loader/pom.xml @@ -173,6 +173,12 @@ ${maven-model.version} test + + org.eclipse.pass + pass-core-test-config + ${project.parent.version} + test + @@ -299,6 +305,8 @@ org.projectlombok:lombok: org.mockito:mockito-inline: com.oracle.database.jdbc:: + + org.eclipse.pass:pass-core-test-config:: 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 index 014b1abf..a683ae38 100644 --- 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 index a46e6675..158af8f1 100644 --- 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 \ No newline at end of file +pass.client.password=moo \ No newline at end of file diff --git a/pass-journal-loader/pass-journal-loader-nih/pom.xml b/pass-journal-loader/pass-journal-loader-nih/pom.xml index 9c6b85f9..f2f58a70 100644 --- a/pass-journal-loader/pass-journal-loader-nih/pom.xml +++ b/pass-journal-loader/pass-journal-loader-nih/pom.xml @@ -80,6 +80,13 @@ ${maven-model.version} test + + + org.eclipse.pass + pass-core-test-config + ${project.parent.version} + test + diff --git a/pass-journal-loader/pass-journal-loader-nih/src/test/java/org/eclipse/pass/loader/journal/nih/DepositIT.java b/pass-journal-loader/pass-journal-loader-nih/src/test/java/org/eclipse/pass/loader/journal/nih/DepositIT.java index 4156ee56..5dd9a3f1 100644 --- a/pass-journal-loader/pass-journal-loader-nih/src/test/java/org/eclipse/pass/loader/journal/nih/DepositIT.java +++ b/pass-journal-loader/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 index 1ad6cc13..4bdc473c 100644 --- a/pass-journal-loader/pom.xml +++ b/pass-journal-loader/pom.xml @@ -138,6 +138,8 @@ org.junit.jupiter:junit-jupiter: + + org.eclipse.pass:pass-core-test-config:: diff --git a/pass-nihms-loader/nihms-data-harvest/pom.xml b/pass-nihms-loader/nihms-data-harvest/pom.xml index 6a7d9067..6f7c0b38 100644 --- a/pass-nihms-loader/nihms-data-harvest/pom.xml +++ b/pass-nihms-loader/nihms-data-harvest/pom.xml @@ -110,6 +110,13 @@ test + + org.eclipse.pass + pass-core-test-config + ${project.parent.version} + test + + diff --git a/pass-nihms-loader/nihms-data-transform-load/pom.xml b/pass-nihms-loader/nihms-data-transform-load/pom.xml index a1ac64d4..7cba7e24 100644 --- a/pass-nihms-loader/nihms-data-transform-load/pom.xml +++ b/pass-nihms-loader/nihms-data-transform-load/pom.xml @@ -154,6 +154,12 @@ ${wiremock-version} test + + org.eclipse.pass + pass-core-test-config + ${project.parent.version} + test + diff --git a/pass-nihms-loader/nihms-data-transform-load/src/test/java/org/eclipse/pass/loader/nihms/NihmsSubmissionEtlITBase.java b/pass-nihms-loader/nihms-data-transform-load/src/test/java/org/eclipse/pass/loader/nihms/NihmsSubmissionEtlITBase.java index 10b46389..ac12796f 100644 --- a/pass-nihms-loader/nihms-data-transform-load/src/test/java/org/eclipse/pass/loader/nihms/NihmsSubmissionEtlITBase.java +++ b/pass-nihms-loader/nihms-data-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 index 54f72c41..645723c8 100644 --- 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 \ No newline at end of file +pass.client.password=moo \ No newline at end of file diff --git a/pass-nihms-loader/pom.xml b/pass-nihms-loader/pom.xml index 5f2b9a21..4fd15f43 100644 --- a/pass-nihms-loader/pom.xml +++ b/pass-nihms-loader/pom.xml @@ -37,11 +37,6 @@ 5.10.1 5.10.0 3.3.1 - - 8080 - http://localhost:8080 - backend - backend @@ -218,6 +213,8 @@ ch.qos.logback:logback-classic: org.slf4j:jcl-over-slf4j: + + org.eclipse.pass:pass-core-test-config:: diff --git a/pass-notification-service/pom.xml b/pass-notification-service/pom.xml index 8a7346bc..77852b7a 100644 --- a/pass-notification-service/pom.xml +++ b/pass-notification-service/pom.xml @@ -221,6 +221,13 @@ test + + org.eclipse.pass + pass-core-test-config + ${project.parent.version} + test + + @@ -359,6 +366,8 @@ ch.qos.logback:logback-classic: + + org.eclipse.pass:pass-core-test-config:: diff --git a/pass-notification-service/src/test/java/org/eclipse/pass/notification/service/NotificationServiceIT.java b/pass-notification-service/src/test/java/org/eclipse/pass/notification/service/NotificationServiceIT.java index 3cf0eb5a..f0248c64 100644 --- a/pass-notification-service/src/test/java/org/eclipse/pass/notification/service/NotificationServiceIT.java +++ b/pass-notification-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 index 8c8e6d9e..64bc0ae0 100644 --- 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