Skip to content

Commit d357376

Browse files
committed
Remove static variables from keycloak.
1 parent 355ac71 commit d357376

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

keycloak/testcontainers/keycloak/__init__.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
from testcontainers.core.container import DockerContainer
1919
from testcontainers.core.waiting_utils import wait_container_is_ready
20+
from typing import Optional
2021

2122

2223
class KeycloakContainer(DockerContainer):
@@ -32,17 +33,17 @@ class KeycloakContainer(DockerContainer):
3233
>>> with KeycloakContainer() as kc:
3334
... keycloak = kc.get_client()
3435
"""
35-
KEYCLOAK_USER = os.environ.get("KEYCLOAK_USER", "test")
36-
KEYCLOAK_PASSWORD = os.environ.get("KEYCLOAK_PASSWORD", "test")
37-
38-
def __init__(self, image="jboss/keycloak:latest") -> None:
36+
def __init__(self, image="jboss/keycloak:latest", username: Optional[str] = None,
37+
password: Optional[str] = None, port: int = 8080) -> None:
3938
super(KeycloakContainer, self).__init__(image=image)
40-
self.port_to_expose = 8080
39+
self.username = username or os.environ.get("KEYCLOAK_USER", "test")
40+
self.password = password or os.environ.get("KEYCLOAK_PASSWORD", "test")
41+
self.port_to_expose = port
4142
self.with_exposed_ports(self.port_to_expose)
4243

4344
def _configure(self) -> None:
44-
self.with_env("KEYCLOAK_USER", self.KEYCLOAK_USER)
45-
self.with_env("KEYCLOAK_PASSWORD", self.KEYCLOAK_PASSWORD)
45+
self.with_env("KEYCLOAK_USER", self.username)
46+
self.with_env("KEYCLOAK_PASSWORD", self.password)
4647

4748
def get_url(self) -> str:
4849
host = self.get_container_host_ip()
@@ -64,8 +65,8 @@ def start(self) -> "KeycloakContainer":
6465
def get_client(self, **kwargs) -> KeycloakAdmin:
6566
default_kwargs = dict(
6667
server_url="{}/auth/".format(self.get_url()),
67-
username=self.KEYCLOAK_USER,
68-
password=self.KEYCLOAK_PASSWORD,
68+
username=self.username,
69+
password=self.password,
6970
realm_name="master",
7071
verify=True,
7172
)

0 commit comments

Comments
 (0)