feat: Prepare next release cycle (4.1.0)

Author: HofmeisterAn

Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <PackageId>$(AssemblyName)</PackageId>
-    <Version>4.0.0</Version>
+    <Version>4.1.0</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <Product>Testcontainers</Product>

src/Testcontainers/Builders/ImageFromDockerfileBuilder.cs

@@ -112,7 +112,7 @@ public override IFutureDockerImage Build()
     /// <inheritdoc />
     protected sealed override ImageFromDockerfileBuilder Init()
     {
-      return base.Init().WithImageBuildPolicy(PullPolicy.Always).WithDockerfile("Dockerfile").WithDockerfileDirectory(Directory.GetCurrentDirectory()).WithName(new DockerImage("localhost/testcontainers", Guid.NewGuid().ToString("D"), string.Empty));
+      return base.Init().WithImageBuildPolicy(PullPolicy.Always).WithDockerfile("Dockerfile").WithDockerfileDirectory(Directory.GetCurrentDirectory()).WithName(new DockerImage(string.Join("/", "localhost", "testcontainers", Guid.NewGuid().ToString("D"))));
     }
 
     /// <inheritdoc />

src/Testcontainers/Images/DockerImage.cs

@@ -51,29 +51,6 @@ public DockerImage(string image)
     {
     }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="DockerImage" /> class.
-    /// </summary>
-    /// <param name="repository">The repository.</param>
-    /// <param name="name">The name.</param>
-    [Obsolete("We will remove this construct and replace it with a more efficient implementation. Please use 'DockerImage(string, string = null, string = null, string = null, string = null)' instead. All arguments except for 'repository' (the first) are optional.")]
-    public DockerImage(string repository, string name)
-      : this(string.Join("/", repository, name).Trim('/'))
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="DockerImage" /> class.
-    /// </summary>
-    /// <param name="repository">The repository.</param>
-    /// <param name="name">The name.</param>
-    /// <param name="tag">The tag.</param>
-    [Obsolete("We will remove this construct and replace it with a more efficient implementation. Please use 'DockerImage(string, string = null, string = null, string = null, string = null)' instead. All arguments except for 'repository' (the first) are optional.")]
-    public DockerImage(string repository, string name, string tag)
-      : this(string.Join("/", repository, name).Trim('/') + (":" + tag).TrimEnd(':'))
-    {
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="DockerImage" /> class.
     /// </summary>
@@ -128,10 +105,6 @@ public string FullName
       }
     }
 
-    /// <inheritdoc />
-    [Obsolete("We will remove this property, it does not follow the DSL. Use the 'Repository' property instead.")]
-    public string Name => GetBackwardsCompatibleName();
-
     /// <inheritdoc />
     public string GetHostname()
     {
@@ -174,13 +147,6 @@ public bool MatchVersion(Predicate<Version> predicate)
       return predicate(new Version(int.Parse(versionMatch.Groups[1].Value, NumberStyles.None), 0));
     }
 
-    private string GetBackwardsCompatibleName()
-    {
-      // The last index will never be a `/`, we trim it in the constructor.
-      var lastIndex = _repository.LastIndexOf('/');
-      return lastIndex == -1 ? _repository : _repository.Substring(lastIndex + 1);
-    }
-
     private static string TrimOrDefault(string value, string defaultValue = null)
     {
       return string.IsNullOrEmpty(value) ? defaultValue : value.Trim(TrimChars);

src/Testcontainers/Images/FutureDockerImage.cs

@@ -78,16 +78,6 @@ public string FullName
       }
     }
 
-    /// <inheritdoc />
-    public string Name
-    {
-      get
-      {
-        ThrowIfResourceNotFound();
-        return _configuration.Image.Name;
-      }
-    }
-
     /// <inheritdoc />
     public string GetHostname()
     {

src/Testcontainers/Images/IImage.cs

@@ -42,13 +42,6 @@ public interface IImage
     [NotNull]
     string FullName { get; }
 
-    /// <summary>
-    /// Gets the name.
-    /// </summary>
-    [NotNull]
-    [Obsolete("We will remove this property, it does not follow the DSL. Use the 'Repository' property instead.")]
-    string Name { get; }
-
     /// <summary>
     /// Gets the registry hostname.
     /// </summary>

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

@@ -26,7 +26,7 @@ public abstract class ProtectDockerDaemonSocket : IAsyncLifetime
     protected ProtectDockerDaemonSocket(ContainerBuilder containerConfiguration, string dockerImageVersion)
     {
       _container = containerConfiguration
-        .WithImage(new DockerImage(string.Empty, "docker", dockerImageVersion + "-dind"))
+        .WithImage(new DockerImage("docker", null, dockerImageVersion + "-dind"))
         .WithPrivileged(true)
         .WithPortBinding(TlsPort, true)
         .WithBindMount(_hostCertsDirectoryPath, _containerCertsDirectoryPath, AccessMode.ReadWrite)

tests/Testcontainers.Tests/Fixtures/Images/HealthCheckFixture.cs

@@ -25,8 +25,6 @@ public sealed class HealthCheckFixture : IImage, IAsyncLifetime
 
     public string FullName => _image.FullName;
 
-    public string Name => _image.Name;
-
     public string GetHostname()
     {
       return _image.GetHostname();

tests/Testcontainers.Tests/Unit/Configurations/ResourcePropertiesTest.cs

@@ -103,7 +103,6 @@ await Task.CompletedTask
       Assert.Throws<InvalidOperationException>(() => image.Tag);
       Assert.Throws<InvalidOperationException>(() => image.Digest);
       Assert.Throws<InvalidOperationException>(() => image.FullName);
-      Assert.Throws<InvalidOperationException>(() => image.Name);
       Assert.Throws<InvalidOperationException>(() => image.GetHostname());
     }
 

tests/Testcontainers.Tests/Unit/Images/ImageFromDockerfileTest.cs

@@ -107,9 +107,9 @@ public async Task ThrowsDockerfileDirectoryDoesNotExist()
     public async Task BuildsDockerImage(string dockerfile)
     {
       // Given
-      IImage tag1 = new DockerImage("localhost/testcontainers", Guid.NewGuid().ToString("D"), string.Empty);
+      IImage tag1 = new DockerImage(new DockerImage(string.Join("/", "localhost", "testcontainers", Guid.NewGuid().ToString("D"))));
 
-      IImage tag2 = new DockerImage("localhost/testcontainers", Guid.NewGuid().ToString("D"), string.Empty);
+      IImage tag2 = new DockerImage(new DockerImage(string.Join("/", "localhost", "testcontainers", Guid.NewGuid().ToString("D"))));
 
       var imageFromDockerfileBuilder = new ImageFromDockerfileBuilder()
         .WithName(tag1)
@@ -132,7 +132,6 @@ await imageFromDockerfileBuilder.CreateAsync()
       Assert.NotNull(imageFromDockerfileBuilder.Repository);
       Assert.NotNull(imageFromDockerfileBuilder.Tag);
       Assert.NotNull(imageFromDockerfileBuilder.FullName);
-      Assert.NotNull(imageFromDockerfileBuilder.Name);
       Assert.Null(imageFromDockerfileBuilder.GetHostname());
     }
   }

tests/Testcontainers.Tests/Unit/Images/TestcontainersImageTest.cs

@@ -66,7 +66,6 @@ public void WhenImageNameGetsAssigned(DockerImageFixtureSerializable serializabl
       Assert.Equal(expected.Tag, actual.Tag);
       Assert.Equal(expected.Digest, actual.Digest);
       Assert.Equal(expected.FullName, actual.FullName);
-      Assert.Equal(expected.Name, actual.Name);
       Assert.Equal(fullName, actual.FullName);
     }