Skip to content

fix(minio): Use wait strategy instead of deprecated decorator #899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(minio): Use wait strategy instead of deprecated decorator #899

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 6 additions & 24 deletions modules/minio/testcontainers/minio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
from typing import TYPE_CHECKING

from requests import ConnectionError, get

from minio import Minio
from testcontainers.core.container import DockerContainer
from testcontainers.core.utils import raise_for_deprecated_parameter
from testcontainers.core.waiting_utils import wait_container_is_ready

if TYPE_CHECKING:
from requests import Response
from testcontainers.core.wait_strategies import HttpWaitStrategy


class MinioContainer(DockerContainer):
Expand Down Expand Up @@ -56,7 +49,11 @@ def __init__(
secret_key: Secret key for client connections.
"""
raise_for_deprecated_parameter(kwargs, "port_to_expose", "port")
super().__init__(image, **kwargs)
super().__init__(
image,
_wait_strategy=HttpWaitStrategy(port, "/minio/health/live"),
**kwargs,
)
self.port = port
self.access_key = access_key
self.secret_key = secret_key
Expand Down Expand Up @@ -97,18 +94,3 @@ def get_config(self) -> dict:
"access_key": self.access_key,
"secret_key": self.secret_key,
}

@wait_container_is_ready(ConnectionError)
def _healthcheck(self) -> None:
"""This is an internal method used to check if the Minio container
is healthy and ready to receive requests."""
url = f"http://{self.get_config()['endpoint']}/minio/health/live"
response: Response = get(url)
response.raise_for_status()

def start(self) -> "MinioContainer":
"""This method starts the Minio container and runs the healthcheck
to verify that the container is ready to use."""
super().start()
self._healthcheck()
return self
Loading