chore: Apply minor simplifications

Author: HofmeisterAn

src/Testcontainers/Builders/MTlsEndpointAuthenticationProvider.cs

@@ -96,6 +96,7 @@ private static X509Certificate2 CreateFromPemFile(string certPemFilePath, string
         }
       }
     }
+
     private static AsymmetricKeyParameter ResolveKeyParameter(object keyObject)
     {
       switch (keyObject)
@@ -105,7 +106,7 @@ private static AsymmetricKeyParameter ResolveKeyParameter(object keyObject)
         case RsaPrivateCrtKeyParameters rpckp:
           return rpckp;
         default:
-          throw new ArgumentOutOfRangeException(nameof(keyObject), "Unsupported type when reading key pem file");
+          throw new ArgumentOutOfRangeException(nameof(keyObject), $"Unsupported asymmetric key entry encountered while trying to resolve key from input object '{keyObject.GetType()}'.");
       }
     }
   }

tests/Testcontainers.Tests/Fixtures/Containers/Unix/DockerMTls.cs

@@ -1,9 +1,7 @@
 namespace DotNet.Testcontainers.Tests.Fixtures
 {
   using System.Collections.Generic;
-  using System.IO;
   using DotNet.Testcontainers.Builders;
-  using Org.BouncyCastle.OpenSsl;
 
   public abstract class DockerMTls : ProtectDockerDaemonSocket
   {
@@ -12,15 +10,6 @@ public DockerMTls(string dockerImageVersion)
     {
     }
 
-    public object ClientCertificateKey()
-    {
-      var path = Path.Combine(_hostCertsDirectoryPath, "client", "key.pem");
-      using (var keyFileStream = new StreamReader(path))
-      {
-        return new PemReader(keyFileStream).ReadObject();
-      }
-    }
-
     public override IList<string> CustomProperties
     {
       get

tests/Testcontainers.Tests/Fixtures/Containers/Unix/DockerTlsFixture.cs

@@ -7,10 +7,9 @@ namespace DotNet.Testcontainers.Tests.Fixtures
   [UsedImplicitly]
   public sealed class DockerTlsFixture : ProtectDockerDaemonSocket
   {
-    public const string DockerVersion = "20.10.18";
     public DockerTlsFixture()
       : base(new ContainerBuilder()
-        .WithCommand("--tlsverify=false"), DockerVersion)
+        .WithCommand("--tlsverify=false"), "20.10.18")
     {
     }
 

tests/Testcontainers.Tests/Fixtures/Containers/Unix/OpenSsl1_1_1Fixture.cs

@@ -5,8 +5,7 @@ namespace DotNet.Testcontainers.Tests.Fixtures
   [UsedImplicitly]
   public sealed class OpenSsl1_1_1Fixture : DockerMTls
   {
-    public const string DockerVersion = "20.10.18";
-    public OpenSsl1_1_1Fixture() : base(DockerVersion)
+    public OpenSsl1_1_1Fixture() : base("20.10.18")
     {
     }
   }

tests/Testcontainers.Tests/Fixtures/Containers/Unix/OpenSsl3_1Fixture.cs

@@ -5,8 +5,7 @@ namespace DotNet.Testcontainers.Tests.Fixtures
   [UsedImplicitly]
   public sealed class OpenSsl3_1Fixture : DockerMTls
   {
-    public const string DockerVersion = "24.0.5";
-    public OpenSsl3_1Fixture() : base(DockerVersion)
+    public OpenSsl3_1Fixture() : base("24.0.5")
     {
     }
   }

tests/Testcontainers.Tests/Fixtures/Containers/Unix/ProtectDockerDaemonSocket.cs

@@ -8,6 +8,7 @@ namespace DotNet.Testcontainers.Tests.Fixtures
   using DotNet.Testcontainers.Configurations;
   using DotNet.Testcontainers.Containers;
   using DotNet.Testcontainers.Images;
+  using Org.BouncyCastle.OpenSsl;
   using Xunit;
 
   public abstract class ProtectDockerDaemonSocket : IAsyncLifetime
@@ -16,16 +17,16 @@ public abstract class ProtectDockerDaemonSocket : IAsyncLifetime
 
     private const ushort TlsPort = 2376;
 
+    private readonly string _hostCertsDirectoryPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("D"), CertsDirectoryName);
+
     private readonly string _containerCertsDirectoryPath = Path.Combine("/", CertsDirectoryName);
 
     private readonly IContainer _container;
 
-    protected readonly string _hostCertsDirectoryPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("D"), CertsDirectoryName);
-
     protected ProtectDockerDaemonSocket(ContainerBuilder containerConfiguration, string dockerImageVersion)
     {
       _container = containerConfiguration
-        .WithImage(DockerImage(dockerImageVersion))
+        .WithImage(new DockerImage(string.Empty, "docker", dockerImageVersion + "-dind"))
         .WithPrivileged(true)
         .WithPortBinding(TlsPort, true)
         .WithBindMount(_hostCertsDirectoryPath, _containerCertsDirectoryPath, AccessMode.ReadWrite)
@@ -38,22 +39,28 @@ public virtual IList<string> CustomProperties
       get
       {
         var customProperties = new List<string>();
-        customProperties.Add($"docker.host={TcpEndpoint}");
+        customProperties.Add($"docker.host={new UriBuilder("tcp", _container.Hostname, _container.GetMappedPublicPort(TlsPort))}");
         customProperties.Add($"docker.cert.path={Path.Combine(_hostCertsDirectoryPath, "client")}");
         return customProperties;
       }
     }
 
-    private static IImage DockerImage(string dockerImageVersion)
+    public IImage Image
     {
-      return new DockerImage(string.Empty, "docker", dockerImageVersion + "-dind");
+      get
+      {
+        return _container.Image;
+      }
     }
 
-    private Uri TcpEndpoint
+    public object TlsKey
     {
       get
       {
-        return new UriBuilder("tcp", _container.Hostname, _container.GetMappedPublicPort(TlsPort)).Uri;
+        using (var tlsKeyStream = new StreamReader(Path.Combine(_hostCertsDirectoryPath, "client", "key.pem")))
+        {
+          return new PemReader(tlsKeyStream).ReadObject();
+        }
       }
     }
 

tests/Testcontainers.Tests/Unit/Containers/Unix/ProtectDockerDaemonSocketTest.cs

@@ -22,7 +22,8 @@ private static IDockerEndpointAuthenticationConfiguration GetAuthConfig(ProtectD
 
     public sealed class MTlsOpenSsl1_1_1 : IClassFixture<OpenSsl1_1_1Fixture>
     {
-      private readonly OpenSsl1_1_1Fixture _fixture;
+      private readonly ProtectDockerDaemonSocket _fixture;
+
       private readonly IDockerEndpointAuthenticationConfiguration _authConfig;
 
       public MTlsOpenSsl1_1_1(OpenSsl1_1_1Fixture dockerMTlsFixture)
@@ -36,20 +37,21 @@ public async Task GetVersionReturnsVersion()
       {
         // Given
         var client = new TestcontainersClient(Guid.Empty, _authConfig, NullLogger.Instance);
+
         // When
         var version = await client.System.GetVersionAsync()
           .ConfigureAwait(false);
-        var key = _fixture.ClientCertificateKey();
 
         // Then
-        Assert.Equal(OpenSsl1_1_1Fixture.DockerVersion, version.Version);
-        Assert.IsType<AsymmetricCipherKeyPair>(key);
+        Assert.StartsWith(version.Version, _fixture.Image.Tag);
+        Assert.IsType<AsymmetricCipherKeyPair>(_fixture.TlsKey);
       }
     }
 
     public sealed class MTlsOpenSsl3_1 : IClassFixture<OpenSsl3_1Fixture>
     {
-      private readonly OpenSsl3_1Fixture _fixture;
+      private readonly ProtectDockerDaemonSocket _fixture;
+
       private readonly IDockerEndpointAuthenticationConfiguration _authConfig;
 
       public MTlsOpenSsl3_1(OpenSsl3_1Fixture dockerMTlsFixture)
@@ -63,23 +65,26 @@ public async Task GetVersionReturnsVersion()
       {
         // Given
         var client = new TestcontainersClient(Guid.Empty, _authConfig, NullLogger.Instance);
+
         // When
         var version = await client.System.GetVersionAsync()
           .ConfigureAwait(false);
-        var key = _fixture.ClientCertificateKey();
 
         // Then
-        Assert.Equal(OpenSsl3_1Fixture.DockerVersion, version.Version);
-        Assert.IsType<RsaPrivateCrtKeyParameters>(key);
+        Assert.StartsWith(version.Version, _fixture.Image.Tag);
+        Assert.IsType<RsaPrivateCrtKeyParameters>(_fixture.TlsKey);
       }
     }
 
     public sealed class Tls : IClassFixture<DockerTlsFixture>
     {
+      private readonly ProtectDockerDaemonSocket _fixture;
+
       private readonly IDockerEndpointAuthenticationConfiguration _authConfig;
 
       public Tls(DockerTlsFixture dockerTlsFixture)
       {
+        _fixture = dockerTlsFixture;
         _authConfig = GetAuthConfig(dockerTlsFixture);
       }
 
@@ -94,7 +99,7 @@ public async Task GetVersionReturnsVersion()
           .ConfigureAwait(false);
 
         // Then
-        Assert.Equal(DockerTlsFixture.DockerVersion, version.Version);
+        Assert.StartsWith(version.Version, _fixture.Image.Tag);
       }
     }
   }