Introduce DockerOpenPaasExtension #1535
Conversation
| - OPENPASS_BASIC_AUTH=YWRtaW5Ab3Blbi1wYWFzLm9yZzpzZWNyZXQ= | ||
| networks: | ||
| - emaily | ||
| - |
There was a problem hiding this comment.
We need more healthcheck if not we will get more unstable tests in future
| users.add(new OpenPaasUser("user" + i + "@open-paas.org", "secret")); | ||
| } | ||
|
|
||
| return users; |
There was a problem hiding this comment.
maybe we need a api for "add test users"
if don't want to all user in Tmail is "[email protected]" for compatible
There was a problem hiding this comment.
I have been searching for a way to do this for about a day now but haven’t found anything. Our best option is to inject an environment variable to indicate how many test users to create and then recompile the OpenPaas Docker image.
Or we need to interact with MongoDB directly and reproduce the below script. We need an extra dependency for that.
There was a problem hiding this comment.
Let's create ourselves into the mongo container the users we need just like this script does?
...end/tmail-third-party/openpaas/src/test/java/com/linagora/tmail/DockerOpenPaasContainer.java
Outdated
Show resolved
Hide resolved
...tmail-third-party/openpaas/src/test/java/com/linagora/tmail/DockerOpenPaasExtensionTest.java
Show resolved
Hide resolved
...tmail-third-party/openpaas/src/test/java/com/linagora/tmail/DockerOpenPaasExtensionTest.java
Outdated
Show resolved
Hide resolved
…agora/tmail/DockerOpenPaasExtensionTest.java Co-authored-by: Benoit TELLIER <[email protected]>
|
|
||
| import reactor.core.publisher.Mono; | ||
|
|
||
| public class DockerOpenPaasPopulateService { |
There was a problem hiding this comment.
The name looks bad. I see nothing connected to docker (we directly connect to mongo).
How about OpenPaaSProvisioningService ?
| hostname: esn | ||
| image: linagora/esn:branch-1.11 | ||
| ports: | ||
| - "8080:8080" |
There was a problem hiding this comment.
Binding fixed ports is an anti pattern as
- it prevents parallel run
- might conflict with other services I run locally when testing
Ideally docker-compose services shall speak on their private network,
And the Java code shall speak to private containers IPs and not to a local port.
| @Test | ||
| void allServersShouldStartSuccessfully() { | ||
| assertTrue(dockerOpenPaasExtension.getDockerOpenPaasSetupSingleton().getAllContainers() | ||
| .stream().allMatch(this::checkContainerStarted)); |
There was a problem hiding this comment.
| .stream().allMatch(this::checkContainerStarted)); | |
| .stream().allMatch(ContainerState::isRunning)); |
Maybe
| private final MongoCollection<Document> usersCollection = database.getCollection("users"); | ||
| private final MongoCollection<Document> domainsCollection = database.getCollection("domains"); |
There was a problem hiding this comment.
Those do not needs to be fields IMO
| private Mono<Document> joinDomain(Document user, Document domain) { | ||
| return Mono.from(usersCollection | ||
| .findOneAndUpdate( | ||
| eq("_id", user.get("_id")), | ||
| push("domains", new Document("domain_id", domain.get("_id"))))); | ||
| } | ||
|
|
||
| public Mono<Document> createUser() { | ||
| UUID randomUUID = UUID.randomUUID(); | ||
| Document userToSave = new Document() | ||
| .append("firstname", "User_" + randomUUID) | ||
| .append("lastname", "User_" + randomUUID) | ||
| .append("password", "secret") | ||
| .append("accounts", List.of(new Document() | ||
| .append("type", "email") | ||
| .append("emails", List.of("user_" + randomUUID + "@open-paas.org")))); | ||
|
|
||
| return Mono.from(usersCollection.insertOne(userToSave)) | ||
| .then(joinDomain(userToSave, getOpenPaasDomain())); | ||
| } |
There was a problem hiding this comment.
| private Mono<Document> joinDomain(Document user, Document domain) { | |
| return Mono.from(usersCollection | |
| .findOneAndUpdate( | |
| eq("_id", user.get("_id")), | |
| push("domains", new Document("domain_id", domain.get("_id"))))); | |
| } | |
| public Mono<Document> createUser() { | |
| UUID randomUUID = UUID.randomUUID(); | |
| Document userToSave = new Document() | |
| .append("firstname", "User_" + randomUUID) | |
| .append("lastname", "User_" + randomUUID) | |
| .append("password", "secret") | |
| .append("accounts", List.of(new Document() | |
| .append("type", "email") | |
| .append("emails", List.of("user_" + randomUUID + "@open-paas.org")))); | |
| return Mono.from(usersCollection.insertOne(userToSave)) | |
| .then(joinDomain(userToSave, getOpenPaasDomain())); | |
| } | |
| public Mono<Document> createUser(Document domain) { | |
| UUID randomUUID = UUID.randomUUID(); | |
| Document userToSave = new Document() | |
| .append("firstname", "User_" + randomUUID) | |
| .append("lastname", "User_" + randomUUID) | |
| .append("password", "secret") | |
| .append("domains", List.of(new Document("domain_id", domain.get("_id")))) | |
| .append("accounts", List.of(new Document() | |
| .append("type", "email") | |
| .append("emails", List.of("user_" + randomUUID + "@open-paas.org")))); | |
| return Mono.from(usersCollection.insertOne(userToSave)) | |
| .then(joinDomain(userToSave, getOpenPaasDomain())); | |
| } |
Create then update do seems to be accidental. Why not create upfront the right document ?
| new File( | ||
| DockerOpenPaasSetup.class.getResource("/docker-openpaas-setup.yml").toURI())) |
There was a problem hiding this comment.
| new File( | |
| DockerOpenPaasSetup.class.getResource("/docker-openpaas-setup.yml").toURI())) | |
| new File(DockerOpenPaasSetup.class.getResource("/docker-openpaas-setup.yml").toURI())) |
| return List.of( | ||
| getOpenPaasContainer(), |
There was a problem hiding this comment.
| return List.of( | |
| getOpenPaasContainer(), | |
| return List.of(getOpenPaasContainer(), |
| if (testsPlayedCount > MAX_TEST_PLAYED) { | ||
| testsPlayedCount = 0; | ||
| restart(); | ||
| } |
There was a problem hiding this comment.
| if (testsPlayedCount > MAX_TEST_PLAYED) { | |
| testsPlayedCount = 0; | |
| restart(); | |
| } | |
| if (testsPlayedCount > MAX_TEST_PLAYED) { | |
| testsPlayedCount = 0; | |
| restart(); | |
| } |
This looks copied and pasted from the Cassandra code where we have good reasons to regularly restart (or do we?)
Here this sounds like early optimisation to me.
Unless provided with a good reason I'd just never restart it for the time being...
| @Override | ||
| public void beforeAll(ExtensionContext context) { | ||
| DockerOpenPaasSetupSingleton.incrementTestsPlayed(); | ||
| DockerOpenPaasSetupSingleton.restartIfMaxTestsPlayed(); | ||
| } | ||
|
|
There was a problem hiding this comment.
| @Override | |
| public void beforeAll(ExtensionContext context) { | |
| DockerOpenPaasSetupSingleton.incrementTestsPlayed(); | |
| DockerOpenPaasSetupSingleton.restartIfMaxTestsPlayed(); | |
| } |
Closes #1527
TODO