address code review issues

Signed-off-by: Daria Korenieva <daric2612@gmail.com>

Author: daric93

docs/modules/valkey.md

@@ -1,6 +1,6 @@
 # Valkey
 
-Since testcontainers-python <a href="https://github.com/testcontainers/testcontainers-python/releases/tag/v4.14.0"><span class="tc-version">:material-tag: v4.14.0</span></a>
+Since testcontainers-python <a href="https://github.com/testcontainers/testcontainers-python/releases/tag/v4.14.3"><span class="tc-version">:material-tag: v4.14.3</span></a>
 
 ## Introduction
 

modules/valkey/example_basic.py

@@ -1,30 +1,32 @@
-from glide import GlideClient, NodeAddress
+"""
+Valkey container usage examples with valkey-glide sync client.
+
+Requires: pip install valkey-glide-sync
+"""
+
+from glide_sync import GlideClient, GlideClientConfiguration, NodeAddress, ServerCredentials
 
 from testcontainers.valkey import ValkeyContainer
 
 
 def basic_example():
     with ValkeyContainer() as valkey_container:
-        # Get connection parameters
         host = valkey_container.get_host()
         port = valkey_container.get_exposed_port()
         connection_url = valkey_container.get_connection_url()
 
         print(f"Valkey connection URL: {connection_url}")
         print(f"Host: {host}, Port: {port}")
 
-        # Connect using Glide client
-        client = GlideClient([NodeAddress(host, port)])
+        config = GlideClientConfiguration([NodeAddress(host, port)])
+        client = GlideClient.create(config)
 
-        # PING command
         pong = client.ping()
         print(f"PING response: {pong}")
 
-        # SET command
         client.set("key", "value")
         print("SET response: OK")
 
-        # GET command
         value = client.get("key")
         print(f"GET response: {value}")
 
@@ -39,35 +41,37 @@ def password_example():
 
         print(f"\nValkey with password connection URL: {connection_url}")
 
-        # Connect using Glide client with password
-        client = GlideClient([NodeAddress(host, port)], password="mypassword")
+        config = GlideClientConfiguration(
+            [NodeAddress(host, port)],
+            credentials=ServerCredentials(password="mypassword"),
+        )
+        client = GlideClient.create(config)
 
-        # PING after auth
         pong = client.ping()
         print(f"PING response: {pong}")
 
         client.close()
 
 
 def version_example():
-    # Using specific version
     with ValkeyContainer().with_image_tag("8.0") as valkey_container:
         print(f"\nUsing image: {valkey_container.image}")
         connection_url = valkey_container.get_connection_url()
         print(f"Connection URL: {connection_url}")
 
 
 def bundle_example():
-    # Using bundle with all modules (JSON, Bloom, Search, etc.)
     with ValkeyContainer().with_bundle() as valkey_container:
         print(f"\nUsing bundle image: {valkey_container.image}")
         host = valkey_container.get_host()
         port = valkey_container.get_exposed_port()
 
-        # Connect using Glide client
-        client = GlideClient([NodeAddress(host, port)])
+        config = GlideClientConfiguration([NodeAddress(host, port)])
+        client = GlideClient.create(config)
+
         pong = client.ping()
         print(f"PING response: {pong}")
+
         client.close()
 
 

modules/valkey/testcontainers/valkey/__init__.py

@@ -11,23 +11,25 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from typing import Optional
-
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.wait_strategies import ExecWaitStrategy
 
+_BASE_IMAGE = "valkey/valkey"
+_BUNDLE_IMAGE = "valkey/valkey-bundle"
+
 
 class ValkeyContainer(DockerContainer):
     """
     Valkey container.
 
     """
 
-    def __init__(self, image: str = "valkey/valkey:latest", port: int = 6379, **kwargs) -> None:
+    def __init__(self, image: str = f"{_BASE_IMAGE}:latest", port: int = 6379, **kwargs) -> None:
         super().__init__(image, **kwargs)
         self.port = port
-        self.password: Optional[str] = None
+        self.password: str | None = None
         self.with_exposed_ports(self.port)
+        self.waiting_for(ExecWaitStrategy(["valkey-cli", "ping"]))
 
     def with_password(self, password: str) -> "ValkeyContainer":
         """
@@ -41,19 +43,20 @@ def with_password(self, password: str) -> "ValkeyContainer":
         """
         self.password = password
         self.with_command(["valkey-server", "--requirepass", password])
+        self.waiting_for(ExecWaitStrategy(["valkey-cli", "-a", password, "ping"]))
         return self
 
     def with_image_tag(self, tag: str) -> "ValkeyContainer":
         """
         Specify Valkey version.
 
         Args:
-            tag: Image tag (e.g., '8.0', 'latest', 'bundle:latest').
+            tag: Image tag (e.g., '8.0', 'latest').
 
         Returns:
             self: Container instance for method chaining.
         """
-        base_image = self.image.split(":")[0]
+        base_image = self.image.rsplit(":", 1)[0]
         self.image = f"{base_image}:{tag}"
         return self
 
@@ -64,7 +67,8 @@ def with_bundle(self) -> "ValkeyContainer":
         Returns:
             self: Container instance for method chaining.
         """
-        self.image = self.image.replace("valkey/valkey", "valkey/valkey-bundle")
+        tag = self.image.rsplit(":", 1)[-1]
+        self.image = f"{_BUNDLE_IMAGE}:{tag}"
         return self
 
     def get_connection_url(self) -> str:
@@ -98,17 +102,3 @@ def get_exposed_port(self) -> int:
         """
         return int(super().get_exposed_port(self.port))
 
-    def start(self) -> "ValkeyContainer":
-        """
-        Start the container and wait for it to be ready.
-
-        Returns:
-            self: Started container instance.
-        """
-        if self.password:
-            self.waiting_for(ExecWaitStrategy(["valkey-cli", "-a", self.password, "ping"]))
-        else:
-            self.waiting_for(ExecWaitStrategy(["valkey-cli", "ping"]))
-
-        super().start()
-        return self

modules/valkey/tests/test_valkey.py

@@ -54,7 +54,7 @@ def test_get_connection_url_with_password():
 
 def test_with_image_tag():
     container = ValkeyContainer().with_image_tag("8.0")
-    assert "valkey/valkey:8.0" in container.image
+    assert container.image == "valkey/valkey:8.0"
 
 
 def test_with_bundle():
@@ -67,6 +67,11 @@ def test_with_bundle_and_tag():
     assert container.image == "valkey/valkey-bundle:9.0"
 
 
+def test_with_tag_and_bundle():
+    container = ValkeyContainer().with_image_tag("8.0").with_bundle()
+    assert container.image == "valkey/valkey-bundle:8.0"
+
+
 def test_bundle_starts():
     with ValkeyContainer().with_bundle() as valkey:
         host = valkey.get_host()