fix(#449): Do not set HostPort to null

testcontainers · Jun 22, 2022 · ada9420 · ada9420
1 parent 99df9ad
commit ada9420
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Testcontainers/Builders/TestcontainersBuilder.cs b/src/Testcontainers/Builders/TestcontainersBuilder.cs
@@ -2,6 +2,7 @@ namespace DotNet.Testcontainers.Builders
 {
   using System;
   using System.Collections.Generic;
+  using System.Globalization;
   using System.Linq;
   using System.Reflection;
   using System.Threading;
@@ -137,7 +138,7 @@ public ITestcontainersBuilder<TDockerContainer> WithEnvironment(IReadOnlyDiction
     /// <inheritdoc cref="ITestcontainersBuilder{TDockerContainer}" />
     public ITestcontainersBuilder<TDockerContainer> WithExposedPort(int port)
     {
-      return this.WithExposedPort($"{port}");
+      return this.WithExposedPort(port.ToString(CultureInfo.InvariantCulture));
     }
 
     /// <inheritdoc cref="ITestcontainersBuilder{TDockerContainer}" />
@@ -150,19 +151,19 @@ public ITestcontainersBuilder<TDockerContainer> WithExposedPort(string port)
     /// <inheritdoc cref="ITestcontainersBuilder{TDockerContainer}" />
     public ITestcontainersBuilder<TDockerContainer> WithPortBinding(int port, bool assignRandomHostPort = false)
     {
-      return this.WithPortBinding($"{port}", assignRandomHostPort);
+      return this.WithPortBinding(port.ToString(CultureInfo.InvariantCulture), assignRandomHostPort);
     }
 
     /// <inheritdoc cref="ITestcontainersBuilder{TDockerContainer}" />
     public ITestcontainersBuilder<TDockerContainer> WithPortBinding(int hostPort, int containerPort)
     {
-      return this.WithPortBinding($"{hostPort}", $"{containerPort}");
+      return this.WithPortBinding(hostPort.ToString(CultureInfo.InvariantCulture), containerPort.ToString(CultureInfo.InvariantCulture));
     }
 
     /// <inheritdoc cref="ITestcontainersBuilder{TDockerContainer}" />
     public ITestcontainersBuilder<TDockerContainer> WithPortBinding(string port, bool assignRandomHostPort = false)
     {
-      var hostPort = assignRandomHostPort ? null : port;
+      var hostPort = assignRandomHostPort ? "0" : port;
       return this.WithPortBinding(hostPort, port);
     }
 

diff --git a/src/Testcontainers/Clients/TestcontainersConfigurationConverter.cs b/src/Testcontainers/Clients/TestcontainersConfigurationConverter.cs
@@ -148,7 +148,7 @@ public ToPortBindings()
       public override IEnumerable<KeyValuePair<string, IList<PortBinding>>> Convert([CanBeNull] IEnumerable<KeyValuePair<string, string>> source)
       {
         return source?.Select(portBinding => new KeyValuePair<string, IList<PortBinding>>(
-          GetQualifiedPort(portBinding.Key), new[] { new PortBinding { HostPort = "0".Equals(portBinding.Value, StringComparison.Ordinal) ? null : portBinding.Value } }));
+          GetQualifiedPort(portBinding.Key), new[] { new PortBinding { HostPort = portBinding.Value } }));
       }
     }
   }