Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BAU bind testcontainers processes to localhost #5544

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

BAU bind testcontainers processes to localhost #5544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94bef3f
BAU bind testcontainers processes to localhost
nlsteers Sep 10, 2024
4652f59
[squash] bind to localhost only on developer laptops
nlsteers Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@
"filename": "src/test/java/uk/gov/pay/connector/rules/PostgresTestDocker.java",
"hashed_secret": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3",
"is_verified": false,
"line_number": 18
"line_number": 24
}
],
"src/test/java/uk/gov/pay/connector/util/RandomIdGeneratorTest.java": [
Expand Down Expand Up @@ -1086,5 +1086,5 @@
}
]
},
"generated_at": "2024-09-06T12:14:52Z"
"generated_at": "2024-09-10T14:27:15Z"
}
22 changes: 19 additions & 3 deletions src/test/java/uk/gov/pay/connector/rules/PostgresTestDocker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
package uk.gov.pay.connector.rules;

import com.github.dockerjava.api.model.ExposedPort;
import com.github.dockerjava.api.model.HostConfig;
import com.github.dockerjava.api.model.PortBinding;
import com.github.dockerjava.api.model.Ports;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.PostgreSQLContainer;


import java.sql.Connection;
import java.sql.SQLException;
import java.util.Optional;

import static java.sql.DriverManager.getConnection;
import static org.testcontainers.containers.PostgreSQLContainer.POSTGRESQL_PORT;

public class PostgresTestDocker {

private static final Logger logger = LoggerFactory.getLogger(PostgresTestDocker.class);

private static final boolean IS_CI = Boolean.parseBoolean(System.getenv("CI"));
private static final String DB_NAME = "connector_test";
private static final String DB_USERNAME = "test";
private static final String DB_PASSWORD = "test";
Expand All @@ -25,7 +31,17 @@ public static void getOrCreate() {

POSTGRES_CONTAINER = new PostgreSQLContainer<>("postgres:15.2")
.withUsername(DB_USERNAME)
.withPassword(DB_PASSWORD);
.withPassword(DB_PASSWORD)
.withCreateContainerCmdModifier(cmd -> {
if (!IS_CI) {
cmd.withHostConfig(
new HostConfig().withPortBindings(new PortBinding(
Ports.Binding.bindIp("127.0.0.1"),
new ExposedPort(POSTGRESQL_PORT)
))
);
}
});

POSTGRES_CONTAINER.start();
createDatabase();
Expand Down
20 changes: 19 additions & 1 deletion src/test/java/uk/gov/pay/connector/rules/SqsTestDocker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,24 @@
import com.amazonaws.client.builder.AwsClientBuilder;
import com.amazonaws.services.sqs.AmazonSQS;
import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
import com.github.dockerjava.api.command.CreateContainerCmd;
import com.github.dockerjava.api.model.ExposedPort;
import com.github.dockerjava.api.model.HostConfig;
import com.github.dockerjava.api.model.PortBinding;
import com.github.dockerjava.api.model.Ports;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait;

import java.util.List;
import java.util.function.Consumer;

import static org.testcontainers.containers.PostgreSQLContainer.POSTGRESQL_PORT;

public class SqsTestDocker {
private static final Logger logger = LoggerFactory.getLogger(SqsTestDocker.class);

private static final boolean IS_CI = Boolean.parseBoolean(System.getenv("CI"));
private static GenericContainer sqsContainer;

public static AmazonSQS initialise(List<String> queueNames) {
Expand All @@ -33,6 +41,16 @@ private static void createContainer() {

sqsContainer = new GenericContainer("softwaremill/elasticmq-native:1.4.2")
.withExposedPorts(9324)
.withCreateContainerCmdModifier((Consumer<CreateContainerCmd>) cmd -> {
if (!IS_CI) {
cmd.withHostConfig(
new HostConfig().withPortBindings(new PortBinding(
Ports.Binding.bindIp("127.0.0.1"),
new ExposedPort(9324)
))
);
}
})
.waitingFor(Wait.forLogMessage(".*ElasticMQ server.*.*started.*", 1));
sqsContainer.start();
}
Expand Down
Loading