-
Notifications
You must be signed in to change notification settings - Fork 98
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NRTM Client Integration Test Set Up (#1574)
* feat: nrtmv4 client setup * feat: add whois-nrtm4-client everywhere * feat: get common dependencies in whois-nrtm-client (aspectJ in them) * feat: read unf and store main information * feat: fix repository * feat: clarify reader * feat: remove unnecesary value injection * feat: add schema creation changes * feat: fix schema syntax error * feat: hardcode for now nrtm baseUrl * feat: hardcode RC * feat: fix compilation issues * feat: add logs and fix the name * feat: change properties and put logs in the condition * feat: add logs * feat: fix log * feat: create nrtm rest client * feat: fix typo * feat: run schedule task each minute * feat: add nrtm4 client to api db endtoend modules * feat: add source log * feat: try catch duplicated key exception when the version already exist * feat: refactor * feat: remove the changes of rest client * feat: remove unused import * feat: change nrtm data soure configurations name * feat: use a rowmapper in between sources call and jsonnode * feat: fix compilation issue * feat: add retrn statment * feat: fix get resources * feat: fix baseUrl * feat: remove the slash from url * feat: ignore unknown properties * feat: filter by version and fix the mapper * feat: handle when table is null * feat: refactor for clarifications * feat: fix sql * feat: check not null * feat: add logs * feat: remove logs and add the group by to fix the query * feat: refactor * feat: put the dependency again in whois-api * feat: do no restart if notification is the same * feat: remove initializeNRTMClient module body * feat: create nrtm dummy server * feat: remove unused import and add the conditional * feat: rename it by client * feat: rename the condition * feat: add dependsOn dependency and conditional just for the config * feat: do not use dependsOn use conditional * feat: add UNF client ITs
- Loading branch information
Showing
12 changed files
with
296 additions
and
18 deletions.
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
...rtm4-client/src/test/java/net/ripe/db/nrtm4/client/AbstractNrtmClientIntegrationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package net.ripe.db.nrtm4.client; | ||
|
|
||
| import net.ripe.db.nrtm4.client.dao.Nrtm4ClientMirrorRepository; | ||
| import net.ripe.db.nrtm4.client.reader.UpdateNotificationFileReader; | ||
| import net.ripe.db.whois.common.dao.jdbc.AbstractDatabaseHelperIntegrationTest; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.test.context.ContextConfiguration; | ||
|
|
||
| @ContextConfiguration(locations = {"classpath:applicationContext-nrtm4-client-test.xml"}) | ||
| public class AbstractNrtmClientIntegrationTest extends AbstractDatabaseHelperIntegrationTest { | ||
|
|
||
| @Autowired | ||
| protected Nrtm4ClientMirrorRepository nrtm4ClientMirrorRepository; | ||
|
|
||
| @Autowired | ||
| protected UpdateNotificationFileReader updateNotificationFileReader; | ||
|
|
||
| @BeforeEach | ||
| public void restoreDatabase(){ | ||
| nrtm4ClientMirrorRepository.truncateTables(); | ||
| } | ||
|
|
||
| @BeforeAll | ||
| public static void setUp(){ | ||
| System.setProperty("nrtm4.client.enabled", "true"); | ||
| } | ||
|
|
||
| @AfterAll | ||
| public static void tearDown(){ | ||
| System.clearProperty("nrtm4.client.enabled"); | ||
| } | ||
|
|
||
|
|
||
| } |
138 changes: 138 additions & 0 deletions
138
whois-nrtm4-client/src/test/java/net/ripe/db/nrtm4/client/NrtmServerDummy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| package net.ripe.db.nrtm4.client; | ||
|
|
||
| import com.google.common.io.Resources; | ||
| import jakarta.annotation.PostConstruct; | ||
| import jakarta.annotation.PreDestroy; | ||
| import jakarta.servlet.http.HttpServletRequest; | ||
| import jakarta.servlet.http.HttpServletResponse; | ||
| import net.ripe.db.nrtm4.client.client.NrtmRestClient; | ||
| import net.ripe.db.whois.common.Stub; | ||
| import net.ripe.db.whois.common.aspects.RetryFor; | ||
| import net.ripe.db.whois.common.profiles.WhoisProfile; | ||
| import org.apache.commons.compress.utils.Lists; | ||
| import org.eclipse.jetty.server.NetworkConnector; | ||
| import org.eclipse.jetty.server.Request; | ||
| import org.eclipse.jetty.server.Server; | ||
| import org.eclipse.jetty.server.handler.AbstractHandler; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.context.annotation.Profile; | ||
| import org.springframework.stereotype.Component; | ||
| import org.springframework.test.util.ReflectionTestUtils; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.charset.Charset; | ||
| import java.util.List; | ||
|
|
||
| @Profile({WhoisProfile.TEST}) | ||
| @Component | ||
| public class NrtmServerDummy implements Stub { | ||
|
|
||
| private static final Logger LOGGER = LoggerFactory.getLogger(NrtmServerDummy.class); | ||
|
|
||
| private Server server; | ||
| private int port = 0; | ||
|
|
||
| private final NrtmRestClient nrtmRestClient; | ||
|
|
||
| private final List<Mock> mocks; | ||
|
|
||
| @Autowired | ||
| public NrtmServerDummy(final NrtmRestClient nrtmRestClient) { | ||
| this.nrtmRestClient = nrtmRestClient; | ||
| this.mocks = Lists.newArrayList(); | ||
| initialiseMocks(); | ||
| } | ||
|
|
||
| @PostConstruct | ||
| @RetryFor(attempts = 5, value = Exception.class) | ||
| public void start() { | ||
| server = new Server(0); | ||
| server.setHandler(new NrtmTestHandler()); | ||
| try { | ||
| server.start(); | ||
| } catch (Exception e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
|
|
||
| this.port = ((NetworkConnector)server.getConnectors()[0]).getLocalPort(); | ||
| final String restUrl = String.format("http://localhost:%s/nrtmv4", getPort()); | ||
| LOGGER.info("NRTM Service dummy server restUrl: {}", restUrl); | ||
| ReflectionTestUtils.setField(nrtmRestClient, "baseUrl", restUrl); | ||
| } | ||
|
|
||
| @PreDestroy | ||
| public void stop() throws Exception { | ||
| server.stop(); | ||
| } | ||
|
|
||
| public int getPort() { | ||
| return port; | ||
| } | ||
|
|
||
| @Override | ||
| public void reset() { | ||
| } | ||
|
|
||
|
|
||
| private class NrtmTestHandler extends AbstractHandler { | ||
| @Override | ||
| public void handle(final String target, final Request baseRequest, final HttpServletRequest request, final HttpServletResponse response) | ||
| throws IOException { | ||
| response.setContentType("text/xml;charset=utf-8"); | ||
| baseRequest.setHandled(true); | ||
|
|
||
| for (Mock mock : mocks) { | ||
| if (mock.matches(request)) { | ||
| response.setStatus(HttpServletResponse.SC_OK); | ||
| response.setContentType(((NrtmResponseMock)mock).mediaType); | ||
| response.getWriter().println(mock.response()); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void initialiseMocks() { | ||
| mocks.add(new NrtmResponseMock("/nrtmv4", "nrtm-sources.html", "application/html")); | ||
| mocks.add(new NrtmResponseMock("/nrtmv4/RIPE-NONAUTH/update-notification-file.json", "nrtm-non-auth-unf.json", "application/json")); | ||
| mocks.add(new NrtmResponseMock("/nrtmv4/RIPE/update-notification-file.json", "nrtm-ripe-unf.json", "application/json")); | ||
| } | ||
|
|
||
|
|
||
| private interface Mock { | ||
|
|
||
| String PATH = "mock/"; | ||
| boolean matches(final HttpServletRequest request); | ||
|
|
||
| String response(); | ||
|
|
||
| default String getResource(final String resource) { | ||
| try { | ||
| // resource is in file | ||
| return Resources.toString(Resources.getResource(PATH + resource), Charset.defaultCharset()); | ||
| } catch (IllegalArgumentException e) { | ||
| // resource doesn't exist (use resource as content) | ||
| return resource; | ||
| } catch (IOException e) { | ||
| // error reading content from resource | ||
| throw new IllegalStateException(e); | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| private record NrtmResponseMock(String fileType, String response, String mediaType) implements Mock { | ||
|
|
||
| private NrtmResponseMock(final String fileType, final String response, final String mediaType) { | ||
| this.fileType = fileType; | ||
| this.response = getResource(response); | ||
| this.mediaType = mediaType; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean matches(final HttpServletRequest request) { | ||
| return request.getRequestURI().endsWith(fileType); | ||
| } | ||
| } | ||
| } |
39 changes: 39 additions & 0 deletions
39
...est/java/net/ripe/db/nrtm4/client/reader/UpdateNotificationFileReaderTestIntegration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package net.ripe.db.nrtm4.client.reader; | ||
|
|
||
| import net.ripe.db.nrtm4.client.AbstractNrtmClientIntegrationTest; | ||
| import net.ripe.db.nrtm4.client.dao.NrtmClientVersionInfo; | ||
| import org.junit.jupiter.api.Tag; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.is; | ||
|
|
||
| @Tag("IntegrationTest") | ||
| public class UpdateNotificationFileReaderTestIntegration extends AbstractNrtmClientIntegrationTest { | ||
|
|
||
| @Test | ||
| public void readUNFThenVersionAdded() { | ||
| updateNotificationFileReader.readFile(); | ||
|
|
||
| final List<NrtmClientVersionInfo> versionInfosPerSource = nrtm4ClientMirrorRepository.getNrtmLastVersionInfo(); | ||
| assertThat(versionInfosPerSource.size(), is(2)); | ||
| } | ||
|
|
||
| @Test | ||
| public void readUNFWhenAlreadyCreatedSameVersionThenVersionNotAdded(){ | ||
| nrtm4ClientMirrorRepository.saveUpdateNotificationFileVersion("RIPE-NONAUTH", 1, "6328095e-7d46-415b-9333-8f2ae274b7c8"); | ||
| nrtm4ClientMirrorRepository.saveUpdateNotificationFileVersion("RIPE", 1, "6328095e-7d46-415b-9333-8f2ae274b7c8"); | ||
|
|
||
| updateNotificationFileReader.readFile(); | ||
|
|
||
| final List<NrtmClientVersionInfo> versionInfosPerSource = nrtm4ClientMirrorRepository.getNrtmLastVersionInfo(); | ||
| assertThat(versionInfosPerSource.getFirst().version(), is(1L)); | ||
| } | ||
|
|
||
| @Test | ||
| public void readUNFButDBInfoAheadThenReInitialize(){ | ||
| // TODO: [MH] Re-initialize | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
whois-nrtm4-client/src/test/resources/applicationContext-nrtm4-client-test.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <beans xmlns="http://www.springframework.org/schema/beans" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns:context="http://www.springframework.org/schema/context" | ||
| xsi:schemaLocation="http://www.springframework.org/schema/beans | ||
| http://www.springframework.org/schema/beans/spring-beans.xsd | ||
| http://www.springframework.org/schema/context | ||
| http://www.springframework.org/schema/context/spring-context.xsd"> | ||
|
|
||
| <context:component-scan base-package="net.ripe.db.nrtm4.client"/> | ||
|
|
||
| <context:property-placeholder | ||
| location="classpath:whois.version.properties,classpath:whois.properties" | ||
| system-properties-mode="OVERRIDE"/> | ||
|
|
||
| <import resource="applicationContext-commons-test.xml"/> | ||
|
|
||
| </beans> |
14 changes: 14 additions & 0 deletions
14
whois-nrtm4-client/src/test/resources/mock/nrtm-non-auth-unf.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "nrtm_version": 1, | ||
| "timestamp": "2024-10-24T13:20:00Z", | ||
| "type": "notification", | ||
| "source": "RIPE-NONAUTH", | ||
| "session_id": "6328095e-7d46-415b-9333-8f2ae274b7c8", | ||
| "version": 1, | ||
| "snapshot": { | ||
| "version": 1, | ||
| "url": "https://localhost/nrtmv4/RIPE-NONAUTH/nrtm-snapshot.1.RIPE-NONAUTH.6328095e-7d46-415b-9333-8f2ae274b7c8.f1195bb8a666fe7b97fa74009a70cefa.json.gz", | ||
| "hash": "e4fa2cc60156a0daace8b7179f68661b0ad765ce09a9ca4bdab0c978b13da973" | ||
| }, | ||
| "deltas": [] | ||
| } |
20 changes: 20 additions & 0 deletions
20
whois-nrtm4-client/src/test/resources/mock/nrtm-ripe-unf.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "nrtm_version": 4, | ||
| "timestamp": "2024-10-25T00:07:00Z", | ||
| "type": "notification", | ||
| "source": "RIPE", | ||
| "session_id": "4521174b-548f-4e51-98fc-dfd720011a0c", | ||
| "version": 1, | ||
| "snapshot": { | ||
| "version": 1, | ||
| "url": "https://localhost/nrtmv4/RIPE/nrtm-snapshot.4.RIPE.4521174b-548f-4e51-98fc-dfd720011a0c.82542bd048e111fe57db404d08b6433e.json.gz", | ||
| "hash": "a15f097005d8082dae14fa28bdb25dc09e59243ef632bcadde44149ba34b373d" | ||
| }, | ||
| "deltas": [ | ||
| { | ||
| "version": 1, | ||
| "url": "https://localhost/nrtmv4/RIPE/nrtm-delta.4.RIPE.4521174b-548f-4e51-98fc-dfd720011a0c.e3be41ff312010046b67d099faa58f44.json", | ||
| "hash": "c50dd7554cb35ef5f2f45d7bfa09fc51033cbe1152d29b36cb1178319e22be3e" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <html> | ||
| <header><title>NRTM Version 4</title></header> | ||
| <body><a href='https://localhost/nrtmv4/RIPE/update-notification-file.json'>RIPE</a><br/><a | ||
| href='https://localhost/nrtmv4/RIPE-NONAUTH/update-notification-file.json'>RIPE-NONAUTH</a><br/> | ||
| <body> | ||
| </html> |