chore: Align tests

Author: HofmeisterAn

docs/modules/opensearch.md

@@ -23,37 +23,40 @@ This example uses xUnit.net's `IAsyncLifetime` interface to manage the lifecycle
     --8<-- "tests/Testcontainers.OpenSearch.Tests/OpenSearchContainerTest.cs:BaseClass"
     }
     ```
-=== "SslBasicAuth"
+=== "Insecure no auth"
     ```csharp
-    --8<-- "tests/Testcontainers.OpenSearch.Tests/OpenSearchContainerTest.cs:SslBasicAuth"
+    --8<-- "tests/Testcontainers.OpenSearch.Tests/OpenSearchContainerTest.cs:InsecureNoAuth"
     ```
-=== "SslBasicAuth CustomPassword"
+=== "SSL default credentials"
     ```csharp
-    --8<-- "tests/Testcontainers.OpenSearch.Tests/OpenSearchContainerTest.cs:SslBasicAuthCustomPassword"
+    --8<-- "tests/Testcontainers.OpenSearch.Tests/OpenSearchContainerTest.cs:SslBasicAuthDefaultCredentials"
     ```
-=== "InsecureNoAuth"
+=== "SSL custom credentials"
     ```csharp
-    --8<-- "tests/Testcontainers.OpenSearch.Tests/OpenSearchContainerTest.cs:InsecureNoAuth"
+    --8<-- "tests/Testcontainers.OpenSearch.Tests/OpenSearchContainerTest.cs:SslBasicAuthCustomCredentials"
     ```
 
-How to check that client established connection:
-=== "PingExample"
+How to check if the client has established a connection:
+
+=== "Ping example"
     ```csharp
     --8<-- "tests/Testcontainers.OpenSearch.Tests/OpenSearchContainerTest.cs:PingExample"
     ```
 
-Creating index and index alias:
-=== "IndexAndAliasCreation"
+Creating an index and alias:
+
+=== "Create index and alias"
     ```csharp
-    --8<-- "tests/Testcontainers.OpenSearch.Tests/OpenSearchContainerTest.cs:IndexAndAliasCreation"
+    --8<-- "tests/Testcontainers.OpenSearch.Tests/OpenSearchContainerTest.cs:CreateIndexAndAlias"
     ```
-=== "CreateTestIndexImpl"
+=== "Create index implementation"
     ```csharp
-    --8<-- "tests/Testcontainers.OpenSearch.Tests/OpenSearchContainerTest.cs:CreateTestIndexImpl"
+    --8<-- "tests/Testcontainers.OpenSearch.Tests/OpenSearchContainerTest.cs:CreateIndexImplementation"
     ```
 
-Indexing and searching for document:
-=== "IndexingDocument"
+Indexing and searching a document:
+
+=== "Indexing document"
     ```csharp
     --8<-- "tests/Testcontainers.OpenSearch.Tests/OpenSearchContainerTest.cs:IndexingDocument"
     ```

src/Testcontainers.OpenSearch/OpenSearchBuilder.cs

@@ -6,11 +6,11 @@ public sealed class OpenSearchBuilder : ContainerBuilder<OpenSearchBuilder, Open
 {
     public const string OpenSearchImage = "opensearchproject/opensearch:2.12.0";
 
-    public const int OpenSearchRestApiPort = 9200;
+    public const ushort OpenSearchRestApiPort = 9200;
 
-    public const int OpenSearchTransportPort = 9300;
+    public const ushort OpenSearchTransportPort = 9300;
 
-    public const int OpenSearchPerformanceAnalyzerPort = 9600;
+    public const ushort OpenSearchPerformanceAnalyzerPort = 9600;
 
     public const string DefaultUsername = "admin";
 
@@ -79,22 +79,26 @@ public override OpenSearchContainer Build()
     {
         Validate();
 
-        var openSearchBuilder = this;
+        OpenSearchBuilder openSearchBuilder;
 
-        const string oldInsecurePassword = "admin";
-        var imageIsBefore_v2_12 = DockerResourceConfiguration.Image.MatchVersion(p => (p.Major == 2 && p.Minor < 12) || p.Major == 1);
-        // OpenSearch images before v2.12.0 have hardcoded default password.
-        // If password have not been set (it equals DefaultPassword), set it to "admin".
-        if (imageIsBefore_v2_12 && string.Equals(DockerResourceConfiguration.Password, DefaultPassword, StringComparison.Ordinal))
+        Predicate<System.Version> predicate = v => v.Major == 1 || (v.Major == 2 && v.Minor < 12);
+
+        var image = DockerResourceConfiguration.Image;
+
+        // Images before version 2.12.0 use a hardcoded default password.
+        var requiresHardcodedDefaultPassword = image.MatchVersion(predicate);
+        if (requiresHardcodedDefaultPassword)
+        {
+            openSearchBuilder = WithPassword("admin");
+        }
+        else
         {
-            openSearchBuilder = WithPassword(oldInsecurePassword);
+            openSearchBuilder = this;
         }
 
         // By default, the base builder waits until the container is running. However, for OpenSearch, a more advanced waiting strategy is necessary that requires access to the password.
         // If the user does not provide a custom waiting strategy, append the default OpenSearch waiting strategy.
-        openSearchBuilder = DockerResourceConfiguration.WaitStrategies.Count() > 1 ?
-            openSearchBuilder :
-            openSearchBuilder.WithWaitStrategy(Wait.ForUnixContainer().AddCustomWaitStrategy(new WaitUntil(openSearchBuilder.DockerResourceConfiguration)));
+        openSearchBuilder = DockerResourceConfiguration.WaitStrategies.Count() > 1 ? openSearchBuilder : openSearchBuilder.WithWaitStrategy(Wait.ForUnixContainer().AddCustomWaitStrategy(new WaitUntil(DockerResourceConfiguration)));
         return new OpenSearchContainer(openSearchBuilder.DockerResourceConfiguration);
     }
 

tests/Testcontainers.OpenSearch.Tests/OpenSearchBuilderTest.cs

@@ -0,0 +1,22 @@
+namespace Testcontainers.OpenSearch;
+
+public sealed class OpenSearchBuilderTest
+{
+    [Theory]
+    [InlineData("opensearchproject/opensearch:1.0.0")]
+    [InlineData("opensearchproject/opensearch:1.1.0")]
+    [InlineData("opensearchproject/opensearch:2.11.0")]
+    [InlineData("opensearchproject/opensearch:2.11.1")]
+    [Trait(nameof(DockerCli.DockerPlatform), nameof(DockerCli.DockerPlatform.Linux))]
+    public void ShouldUseHardcodedDefaultPassword(string image)
+    {
+        // Given
+        var opensearchContainer = new OpenSearchBuilder().WithImage(image).Build();
+
+        // When
+        var credentials = opensearchContainer.GetCredentials();
+
+        // Then
+        Assert.Equal("admin", credentials.Password);
+    }
+}