Skip to content

Commit

Permalink
Revert "nats: more verbose output to help with #1978"
Browse files Browse the repository at this point in the history
This reverts commit 9401d0c.
  • Loading branch information
aldettinger committed Nov 24, 2020
1 parent 9ccb7ae commit a35bc1d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,27 @@ public class NatsConfiguration {
NatsComponent natsBasicAuth() {
NatsComponent component = new NatsComponent();
component.setServers(natsBasicAuthBrokerUrl);
component.setVerbose(true);
return component;
}

@Named
NatsComponent natsNoAuth() {
NatsComponent component = new NatsComponent();
component.setServers(natsNoAuthBrokerUrl);
component.setVerbose(true);
return component;
}

@Named
NatsComponent natsTlsAuth() {
NatsComponent component = new NatsComponent();
component.setServers(natsTlsAuthBrokerUrl);
component.setVerbose(true);
return component;
}

@Named
NatsComponent natsTokenAuth() {
NatsComponent component = new NatsComponent();
component.setServers(natsTokenAuthBrokerUrl);
component.setVerbose(true);
return component;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.utility.TestcontainersConfiguration;

Expand Down Expand Up @@ -51,7 +50,6 @@ public Map<String, String> start() {
// Start the container needed for the basic authentication test
basicAuthContainer = new GenericContainer(NATS_IMAGE).withExposedPorts(NATS_SERVER_PORT)
.withCommand("-DV", "--user", BASIC_AUTH_USERNAME, "--pass", BASIC_AUTH_PASSWORD)
.withLogConsumer(new Slf4jLogConsumer(LOG))
.waitingFor(Wait.forLogMessage(".*Server is ready.*", 1));
basicAuthContainer.start();
String basicAuthIp = basicAuthContainer.getContainerIpAddress();
Expand All @@ -61,7 +59,6 @@ public Map<String, String> start() {

// Start the container needed for tests without authentication
noAuthContainer = new GenericContainer(NATS_IMAGE).withExposedPorts(NATS_SERVER_PORT)
.withLogConsumer(new Slf4jLogConsumer(LOG))
.waitingFor(Wait.forLogMessage(".*Listening for route connections.*", 1));
noAuthContainer.start();
String noAuthIp = noAuthContainer.getContainerIpAddress();
Expand All @@ -79,7 +76,6 @@ public Map<String, String> start() {
"--tlskey=/certs/key.pem",
"--tlsverify",
"--tlscacert=/certs/ca.pem")
.withLogConsumer(new Slf4jLogConsumer(LOG))
.waitingFor(Wait.forLogMessage(".*Server is ready.*", 1));
tlsAuthContainer.start();
String tlsAuthIp = tlsAuthContainer.getContainerIpAddress();
Expand All @@ -89,7 +85,6 @@ public Map<String, String> start() {
// Start the container needed for the token authentication test
tokenAuthContainer = new GenericContainer(NATS_IMAGE).withExposedPorts(NATS_SERVER_PORT)
.withCommand("-DV", "-auth", TOKEN_AUTH_TOKEN)
.withLogConsumer(new Slf4jLogConsumer(LOG))
.waitingFor(Wait.forLogMessage(".*Server is ready.*", 1));
tokenAuthContainer.start();
String tokenAuthIp = tokenAuthContainer.getContainerIpAddress();
Expand Down

0 comments on commit a35bc1d

Please sign in to comment.