Rename port_to_expose to port.

Author: tillahoffmann

clickhouse/testcontainers/clickhouse/__init__.py

@@ -48,8 +48,8 @@ def __init__(self, image: str = "clickhouse/clickhouse-server:latest", port: int
         self.username = username or os.environ.get("CLICKHOUSE_USER", "test")
         self.password = password or os.environ.get("CLICKHOUSE_PASSWORD", "test")
         self.dbname = dbname or os.environ.get("CLICKHOUSE_DB", "test")
-        self.port_to_expose = port
-        self.with_exposed_ports(self.port_to_expose)
+        self.port = port
+        self.with_exposed_ports(self.port)
 
     @wait_container_is_ready(Error, EOFError)
     def _connect(self) -> None:
@@ -68,5 +68,5 @@ def get_connection_url(self, host: Optional[str] = None) -> str:
             password=self.password,
             dbname=self.dbname,
             host=host,
-            port=self.port_to_expose,
+            port=self.port,
         )

elasticsearch/testcontainers/elasticsearch/__init__.py

@@ -77,8 +77,8 @@ class ElasticSearchContainer(DockerContainer):
     def __init__(self, image: str = "elasticsearch", port: int = 9200, **kwargs) -> None:
         raise_for_deprecated_parameter(kwargs, "port_to_expose", "port")
         super(ElasticSearchContainer, self).__init__(image, **kwargs)
-        self.port_to_expose = port
-        self.with_exposed_ports(self.port_to_expose)
+        self.port = port
+        self.with_exposed_ports(self.port)
         self.with_env('transport.host', '127.0.0.1')
         self.with_env('http.host', '0.0.0.0')
 
@@ -94,7 +94,7 @@ def _connect(self) -> None:
 
     def get_url(self) -> str:
         host = self.get_container_host_ip()
-        port = self.get_exposed_port(self.port_to_expose)
+        port = self.get_exposed_port(self.port)
         return f'http://{host}:{port}'
 
     def start(self) -> "ElasticSearchContainer":

keycloak/testcontainers/keycloak/__init__.py

@@ -38,16 +38,16 @@ def __init__(self, image="jboss/keycloak:latest", username: Optional[str] = None
         super(KeycloakContainer, self).__init__(image=image)
         self.username = username or os.environ.get("KEYCLOAK_USER", "test")
         self.password = password or os.environ.get("KEYCLOAK_PASSWORD", "test")
-        self.port_to_expose = port
-        self.with_exposed_ports(self.port_to_expose)
+        self.port = port
+        self.with_exposed_ports(self.port)
 
     def _configure(self) -> None:
         self.with_env("KEYCLOAK_USER", self.username)
         self.with_env("KEYCLOAK_PASSWORD", self.password)
 
     def get_url(self) -> str:
         host = self.get_container_host_ip()
-        port = self.get_exposed_port(self.port_to_expose)
+        port = self.get_exposed_port(self.port)
         return f"http://{host}:{port}"
 
     @wait_container_is_ready(requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout)

mssql/testcontainers/mssql/__init__.py

@@ -27,8 +27,8 @@ def __init__(self, image: str = "mcr.microsoft.com/mssql/server:2019-latest",
         raise_for_deprecated_parameter(kwargs, "user", "username")
         super(SqlServerContainer, self).__init__(image, **kwargs)
 
-        self.port_to_expose = port
-        self.with_exposed_ports(self.port_to_expose)
+        self.port = port
+        self.with_exposed_ports(self.port)
 
         self.password = password or environ.get("SQLSERVER_PASSWORD", "1Secure*Password1")
         self.username = username
@@ -44,5 +44,5 @@ def _configure(self) -> None:
     def get_connection_url(self) -> str:
         return super()._create_connection_url(
             dialect=self.dialect, username=self.username, password=self.password,
-            dbname=self.dbname, port=self.port_to_expose
+            dbname=self.dbname, port=self.port
         )

mysql/testcontainers/mysql/__init__.py

@@ -47,8 +47,8 @@ def __init__(self, image: str = "mysql:latest", username: Optional[str] = None,
         raise_for_deprecated_parameter(kwargs, "MYSQL_DATABASE", "dbname")
         super(MySqlContainer, self).__init__(image, **kwargs)
 
-        self.port_to_expose = port
-        self.with_exposed_ports(self.port_to_expose)
+        self.port = port
+        self.with_exposed_ports(self.port)
         self.username = username or environ.get('MYSQL_USER', 'test')
         self.root_password = root_password or environ.get('MYSQL_ROOT_PASSWORD', 'test')
         self.password = password or environ.get('MYSQL_PASSWORD', 'test')
@@ -70,4 +70,4 @@ def get_connection_url(self) -> str:
                                               username=self.username,
                                               password=self.password,
                                               dbname=self.dbname,
-                                              port=self.port_to_expose)
+                                              port=self.port)

postgres/testcontainers/postgres/__init__.py

@@ -47,10 +47,10 @@ def __init__(self, image: str = "postgres:latest", port: int = 5432,
         self.username = username or os.environ.get("POSTGRES_USER", "test")
         self.password = password or os.environ.get("POSTGRES_PASSWORD", "test")
         self.dbname = dbname or os.environ.get("POSTGRES_DB", "test")
-        self.port_to_expose = port
+        self.port = port
         self.driver = driver
 
-        self.with_exposed_ports(self.port_to_expose)
+        self.with_exposed_ports(self.port)
 
     def _configure(self) -> None:
         self.with_env("POSTGRES_USER", self.username)
@@ -61,5 +61,5 @@ def get_connection_url(self, host=None) -> str:
         return super()._create_connection_url(
             dialect=f"postgresql+{self.driver}", username=self.username,
             password=self.password, dbname=self.dbname, host=host,
-            port=self.port_to_expose,
+            port=self.port,
         )

redis/testcontainers/redis/__init__.py

@@ -35,9 +35,9 @@ def __init__(self, image: str = "redis:latest", port: int = 6379,
                  password: Optional[str] = None, **kwargs) -> None:
         raise_for_deprecated_parameter(kwargs, "port_to_expose", "port")
         super(RedisContainer, self).__init__(image, **kwargs)
-        self.port_to_expose = port
+        self.port = port
         self.password = password
-        self.with_exposed_ports(self.port_to_expose)
+        self.with_exposed_ports(self.port)
         if self.password:
             self.with_command(f"redis-server --requirepass {self.password}")
 
@@ -59,7 +59,7 @@ def get_client(self, **kwargs) -> redis.Redis:
         """
         return redis.Redis(
             host=self.get_container_host_ip(),
-            port=self.get_exposed_port(self.port_to_expose),
+            port=self.get_exposed_port(self.port),
             password=self.password,
             **kwargs,
         )