Skip to content

Fixed bug where consul container always starts at port 8500. #876

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

Open
wants to merge 1 commit into
base: 2.8.x
Choose a base branch
from
Open

Fixed bug where consul container always starts at port 8500. #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 21 additions & 13 deletions ...rp-consul/src/main/java/io/micronaut/testresources/consul/ConsulTestResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,16 @@ public class ConsulTestResourceProvider extends AbstractTestContainersProvider<C

public static final List<String> RESOLVABLE_PROPERTIES_LIST = Collections.unmodifiableList(Arrays.asList(
PROPERTY_CONSUL_CLIENT_HOST,
PROPERTY_CONSUL_CLIENT_PORT
PROPERTY_CONSUL_CLIENT_PORT,
PROPERTY_CONSUL_CLIENT_DEFAULT_ZONE
));

public static final String HASHICORP_CONSUL_KV_PROPERTIES_KEY = "containers.hashicorp-consul.kv-properties";
public static final String SIMPLE_NAME = "hashicorp-consul";
public static final String DEFAULT_IMAGE = "hashicorp/consul";
public static final int CONSUL_HTTP_PORT = 8500;
public static final String SIMPLE_NAME = "hashicorp-consul";
public static final String DISPLAY_NAME = "Consul";

public static final int CONSUL_HTTP_PORT = 8500;

@Override
public List<String> getResolvableProperties(Map<String, Collection<String>> propertyEntries, Map<String, Object> testResourcesConfig) {
Expand All @@ -65,29 +67,35 @@ protected String getDefaultImageName() {
@Override
protected ConsulContainer createContainer(DockerImageName imageName, Map<String, Object> requestedProperties, Map<String, Object> testResourcesConfig) {
ConsulContainer consulContainer = new ConsulContainer(imageName);
// Micronaut Discovery Consul will only listen to the default port 8500
consulContainer.setPortBindings(Collections.singletonList(CONSUL_HTTP_PORT + ":" + CONSUL_HTTP_PORT));

// We intentionally do NOT set port bindings here, allowing Testcontainers to assign a random port

// Set startup properties
if (testResourcesConfig.containsKey(HASHICORP_CONSUL_KV_PROPERTIES_KEY)) {
@SuppressWarnings("unchecked")
List<String> properties = (List<String>) testResourcesConfig.get(HASHICORP_CONSUL_KV_PROPERTIES_KEY);
if(null != properties && !properties.isEmpty()) {
properties.stream().forEach((property) -> consulContainer.withConsulCommand("kv put " + property.replace("=", " ")));
properties.forEach((property) -> consulContainer.withConsulCommand("kv put " + property.replace("=", " ")));
}
}

return consulContainer;
}

@Override
protected Optional<String> resolveProperty(String propertyName, ConsulContainer container) {
if (PROPERTY_CONSUL_CLIENT_HOST.equals(propertyName)) {
return Optional.of(container.getHost());
} else if (PROPERTY_CONSUL_CLIENT_PORT.equals(propertyName)) {
return Optional.of(container.getMappedPort(CONSUL_HTTP_PORT).toString());
} else if (PROPERTY_CONSUL_CLIENT_DEFAULT_ZONE.equals(propertyName)) {
return Optional.of(container.getHost() + ":" + container.getMappedPort(CONSUL_HTTP_PORT));
if (propertyName != null && propertyName.startsWith(PREFIX)) {
// Resolve the property
switch (propertyName) {
case PROPERTY_CONSUL_CLIENT_HOST -> {
return Optional.of(container.getHost());
}
case PROPERTY_CONSUL_CLIENT_PORT -> {
return Optional.of(container.getMappedPort(CONSUL_HTTP_PORT).toString());
}
case PROPERTY_CONSUL_CLIENT_DEFAULT_ZONE -> {
return Optional.of(container.getHost() + ":" + container.getMappedPort(CONSUL_HTTP_PORT));
}
}
}
return Optional.empty();
}
Expand Down
1 change: 0 additions & 1 deletion test-resources-hashicorp-consul/src/test/resources/bootstrap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ consul:
client:
config:
enabled: true
default-zone: "localhost:8500"
test-resources:
containers:
hashicorp-consul:
Expand Down
Loading