Skip to content

fix(registry): module typed #811

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 9 additions & 6 deletions modules/registry/testcontainers/registry/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import time
from io import BytesIO
from tarfile import TarFile, TarInfo
from typing import TYPE_CHECKING, Optional
from typing import TYPE_CHECKING, Any, Optional

import bcrypt
from requests import get
Expand All @@ -25,7 +25,7 @@ def __init__(
port: int = 5000,
username: Optional[str] = None,
password: Optional[str] = None,
**kwargs,
**kwargs: Any,
) -> None:
super().__init__(image=image, **kwargs)
self.port: int = port
Expand All @@ -35,6 +35,8 @@ def __init__(

def _copy_credentials(self) -> None:
# Create credentials and write them to the container
if self.password is None:
raise ValueError("Password cannot be None")
hashed_password: str = bcrypt.hashpw(
self.password.encode("utf-8"),
bcrypt.gensalt(rounds=12, prefix=b"2a"),
Expand All @@ -44,7 +46,7 @@ def _copy_credentials(self) -> None:
with BytesIO() as tar_archive_object, TarFile(fileobj=tar_archive_object, mode="w") as tmp_tarfile:
tarinfo: TarInfo = TarInfo(name=self.credentials_path)
tarinfo.size = len(content)
tarinfo.mtime = time.time()
tarinfo.mtime = int(time.time())

tmp_tarfile.addfile(tarinfo, BytesIO(content))
tar_archive_object.seek(0)
Expand All @@ -54,12 +56,13 @@ def _copy_credentials(self) -> None:
def _readiness_probe(self) -> None:
url: str = f"http://{self.get_registry()}/v2"
if self.username and self.password:
response: Response = get(url, auth=HTTPBasicAuth(self.username, self.password), timeout=1)
auth_response: Response = get(url, auth=HTTPBasicAuth(self.username, self.password), timeout=1)
auth_response.raise_for_status()
else:
response: Response = get(url, timeout=1)
response.raise_for_status()
response.raise_for_status()

def start(self):
def start(self) -> "DockerRegistryContainer":
if self.username and self.password:
self.with_env("REGISTRY_AUTH_HTPASSWD_REALM", "local-registry")
self.with_env("REGISTRY_AUTH_HTPASSWD_PATH", self.credentials_path)
Expand Down
4 changes: 2 additions & 2 deletions modules/registry/tests/test_registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
REGISTRY_PASSWORD: str = "bar"


def test_registry():
def test_registry() -> None:
with DockerRegistryContainer().with_bind_ports(5000, 5000) as registry_container:
url: str = f"http://{registry_container.get_registry()}/v2/_catalog"

Expand All @@ -16,7 +16,7 @@ def test_registry():
assert response.status_code == 200


def test_registry_with_authentication():
def test_registry_with_authentication() -> None:
with DockerRegistryContainer(username=REGISTRY_USERNAME, password=REGISTRY_PASSWORD).with_bind_ports(
5000, 5000
) as registry_container:
Expand Down
5 changes: 5 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,11 @@ module = ['wrapt.*']
# wrapt doesn't have type annotations
ignore_missing_imports = true

[[tool.mypy.overrides]]
module = ['requests.*']
# requests doesn't have type annotations
ignore_missing_imports = true

[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"
Loading