Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion src/Microcks.Testcontainers/MicrocksBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,15 @@ public sealed class MicrocksBuilder : ContainerBuilder<MicrocksBuilder, Microcks
IArtifactAndSnapshotManager<MicrocksBuilder>
{
/// <summary>
/// Image name for the Microcks container.
/// Default image name for the Microcks container.
/// </summary>
public const string MicrocksImage = "quay.io/microcks/microcks-uber";

/// <summary>
/// Image name for the Microcks container.
/// </summary>
private string _microcksImage = MicrocksImage;

/// <summary>
/// HTTP port for the Microcks container.
/// </summary>
Expand All @@ -47,6 +52,16 @@ public sealed class MicrocksBuilder : ContainerBuilder<MicrocksBuilder, Microcks

private List<Model.Secret> _secrets;

/// <summary>
/// Initializes a new instance of the <see cref="MicrocksBuilder" /> class.
/// </summary>
/// <param name="image">The Docker image to use.</param>
public MicrocksBuilder(string image)
: this()
{
_microcksImage = image;
}

/// <summary>
/// Initializes a new instance of the <see cref="MicrocksBuilder" /> class.
/// </summary>
Expand Down
6 changes: 2 additions & 4 deletions src/Microcks.Testcontainers/MicrocksContainerEnsemble.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,11 @@ public MicrocksContainerEnsemble(INetwork network, string microcksImage)
this._microcksImage = microcksImage;
this._network = network;

this._microcksBuilder = new MicrocksBuilder()
this._microcksBuilder = new MicrocksBuilder(this._microcksImage)
.WithNetwork(this._network)
.WithNetworkAliases("microcks")
.WithExposedPort(MicrocksBuilder.MicrocksHttpPort)
.WithExposedPort(MicrocksBuilder.MicrocksGrpcPort)
.WithImage(this._microcksImage)
.WithEnvironment(MacOSHelper.GetJavaOptions())
.WithEnvironment("POSTMAN_RUNNER_URL", "http://postman:3000")
.WithEnvironment("TEST_CALLBACK_URL", "http://microcks:" + MicrocksBuilder.MicrocksHttpPort)
Expand Down Expand Up @@ -185,8 +184,7 @@ public MicrocksContainerEnsemble WithPostman()
/// <returns>The updated <see cref="MicrocksContainerEnsemble"/> instance.</returns>
public MicrocksContainerEnsemble WithPostman(string image)
{
this._postmanBuilder = new ContainerBuilder()
.WithImage(image)
this._postmanBuilder = new ContainerBuilder(image)
.WithNetwork(this._network)
.WithNetworkAliases("postman")
.WithWaitStrategy(Wait.ForUnixContainer().UntilMessageIsLogged(".*postman-runtime wrapper listening on port.*"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ public async ValueTask InitializeAsync()
{
var cancellationToken = TestContext.Current.CancellationToken;
_network = new NetworkBuilder().Build();
_rabbitMqContainer = new RabbitMqBuilder()
.WithImage("rabbitmq:3.13-management-alpine")
_rabbitMqContainer = new RabbitMqBuilder("rabbitmq:3.13-management-alpine")
.WithNetwork(_network)
.WithNetworkAliases("rabbitmq")
.Build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,7 @@ public KafkaFixture()
{
Network = new NetworkBuilder().Build();

KafkaContainer = new KafkaBuilder()
.WithImage("confluentinc/cp-kafka:7.8.0")
KafkaContainer = new KafkaBuilder("confluentinc/cp-kafka:7.8.0")
.WithNetwork(Network)
.WithNetworkAliases("kafka")
.WithListener("kafka:19092")
Expand All @@ -280,4 +279,4 @@ public async ValueTask DisposeAsync()
}
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ public async ValueTask InitializeAsync()
.WithMainArtifacts("pastry-orders-asyncapi.yml")
.WithAsyncFeature();

this.WsBadImplContainer = new ContainerBuilder()
.WithImage(BadPastryAsyncImage)
this.WsBadImplContainer = new ContainerBuilder(BadPastryAsyncImage)
.WithNetwork(this.MicrocksContainerEnsemble.Network)
.WithNetworkAliases("bad-impl")
.WithExposedPort(4001)
Expand All @@ -70,8 +69,7 @@ public async ValueTask InitializeAsync()
)
.Build();

this.WsGoodImplContainer = new ContainerBuilder()
.WithImage(GoodPastryAsyncImage)
this.WsGoodImplContainer = new ContainerBuilder(GoodPastryAsyncImage)
.WithNetwork(this.MicrocksContainerEnsemble.Network)
.WithNetworkAliases("good-impl")
.WithExposedPort(4002)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,13 @@ public MicrocksContractTestingFixture()
.WithNetwork(Network)
.Build();

BadImpl = new ContainerBuilder()
.WithImage(BAD_PASTRY_IMAGE)
BadImpl = new ContainerBuilder(BAD_PASTRY_IMAGE)
.WithNetwork(Network)
.WithNetworkAliases("bad-impl")
.WithWaitStrategy(Wait.ForUnixContainer().UntilMessageIsLogged(".*Example app listening on port 3001.*"))
.Build();

GoodImpl = new ContainerBuilder()
.WithImage(GOOD_PASTRY_IMAGE)
GoodImpl = new ContainerBuilder(GOOD_PASTRY_IMAGE)
.WithNetwork(Network)
.WithNetworkAliases("good-impl")
.WithWaitStrategy(Wait.ForUnixContainer().UntilMessageIsLogged(".*Example app listening on port 3002.*"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PackageReference Include="coverlet.collector" Version="6.0.4" />
<PackageReference Include="RabbitMQ.Client" Version="7.2.0" />
<PackageReference Include="RestAssured.Net" Version="4.10.0" />
<PackageReference Include="Confluent.Kafka" Version="2.12.0" />
<PackageReference Include="Confluent.Kafka" Version="2.13.0" />
<PackageReference Include="TestContainers.Kafka" Version="4.10.0" />
<PackageReference Include="TestContainers.Keycloak" Version="4.10.0" />
<PackageReference Include="Testcontainers.RabbitMq" Version="4.10.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ public MicrocksContractTestingFunctionalityWithOAuth2Tests(MicrocksContractTesti
{
_fixture = fixture;
var network = _fixture.Network;
_keycloak = new KeycloakBuilder()
.WithImage("quay.io/keycloak/keycloak:26.0.0")
_keycloak = new KeycloakBuilder("quay.io/keycloak/keycloak:26.0.0")
.WithEnvironment(MacOSHelper.GetJavaOptions("JAVA_OPTS_APPEND"))
.WithNetwork(network)
.WithNetworkAliases("keycloak")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,13 @@ public PostmanFixture()
{
Network = new NetworkBuilder().Build();

BadImpl = new ContainerBuilder()
.WithImage(BAD_PASTRY_IMAGE)
BadImpl = new ContainerBuilder(BAD_PASTRY_IMAGE)
.WithNetwork(Network)
.WithNetworkAliases("bad-impl")
.WithWaitStrategy(Wait.ForUnixContainer().UntilMessageIsLogged(".*Example app listening on port 3002.*"))
.Build();

GoodImpl = new ContainerBuilder()
.WithImage(GOOD_PASTRY_IMAGE)
GoodImpl = new ContainerBuilder(GOOD_PASTRY_IMAGE)
.WithNetwork(Network)
.WithNetworkAliases("good-impl")
.WithWaitStrategy(Wait.ForUnixContainer().UntilMessageIsLogged(".*Example app listening on port 3003.*"))
Expand Down
Loading