added support for enterprise images

Author: daimor

README.md

@@ -24,4 +24,19 @@
 
 The snippet above will spin up a InterSystems IRIS database in a container. The get_connection_url() convenience method returns a sqlalchemy compatible url we use to connect to the database and retrieve the database version.
 
+It is possible to run Enterprise edition as well, with passing a valid iris.key.
+
+```python
+iris_container = IRISContainer(
+    "containers.intersystems.com/intersystems/iris:2023.3", 
+    license_key="/full/path/to/iris.key",
+    username="testuser",
+    password="testpass",
+    namespace="TEST",
+)
+
+```
+
+`username`, `password`, `namespace` will be created during start of the container with required values, user will get %All role
+
 More extensive documentation can be found at [Read The Docs](https://testcontainers-python.readthedocs.io/).

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name="testcontainers-iris",
-    version="1.0.2",
+    version="1.1.0",
     packages=find_namespace_packages(),
     description=description,
     long_description=open('README.md').read(),

testcontainers/iris/__init__.py

@@ -2,7 +2,7 @@
 from typing import Optional
 from testcontainers.core.generic import DbContainer
 # from testcontainers.core.utils import raise_for_deprecated_parameter
-
+from testcontainers.core.waiting_utils import wait_for_logs
 
 class IRISContainer(DbContainer):
     """
@@ -27,27 +27,54 @@ class IRISContainer(DbContainer):
             >>> version
             'IRIS for UNIX (Ubuntu Server LTS for ARM64 Containers) 2023.2 (Build 227U) Mon Jul 31 2023 17:43:25 EDT'
     """
-    def __init__(self, image: str = "intersystemsdc/iris-community:latest", port: int = 1972,
-                 username: Optional[str] = None, password: Optional[str] = None,
-                 dbname: Optional[str] = None, driver: str = "iris", **kwargs) -> None:
+    def __init__(self, image: str = "intersystemsdc/iris-community:latest",
+                 port: int = 1972,
+                 username: Optional[str] = None,
+                 password: Optional[str] = None,
+                 namespace: Optional[str] = None,
+                 driver: str = "iris",
+                 license_key: str = None,
+                 **kwargs
+                 ) -> None:
         # raise_for_deprecated_parameter(kwargs, "user", "username")
         super(IRISContainer, self).__init__(image=image, **kwargs)
+        self.image = image
         self.username = username or os.environ.get("IRIS_USERNAME", "test")
         self.password = password or os.environ.get("IRIS_PASSWORD", "test")
-        self.dbname = dbname or os.environ.get("IRIS_NAMESPACE", "USER")
+        self.namespace = namespace or os.environ.get("IRIS_NAMESPACE", "USER")
         self.port = port
         self.driver = driver
+        self.license_key = license_key
 
         self.with_exposed_ports(self.port)
 
     def _configure(self) -> None:
         self.with_env("IRIS_USERNAME", self.username)
         self.with_env("IRIS_PASSWORD", self.password)
-        self.with_env("IRIS_NAMESPACE", self.dbname)
+        self.with_env("IRIS_NAMESPACE", self.namespace)
+        if self.license_key:
+            self.with_volume_mapping(self.license_key, "/usr/irissys/mgr/iris.key", "ro")
+    def _connect(self) -> None:
+        wait_for_logs(self, predicate="Enabling logons")
+        if self.image.startswith("intersystemsdc"):
+            wait_for_logs(self, predicate="executed command")
+        else:
+            if self.namespace.upper() != "USER":
+                cmd = f"iris session iris -U %%SYS '##class(%%SQL.Statement).%%ExecDirect(,\"CREATE DATABASE %s\")'" % (
+                    self.namespace,
+                )
+                self.exec(cmd)
+            cmd = f"iris session iris -U %%SYS '##class(Security.Users).Create(\"%s\",\"%s\",\"%s\",,\"%s\")'" % (
+                self.username,
+                "%ALL",
+                self.password,
+                self.namespace,
+            )
+            res = self.exec(cmd)
 
     def get_connection_url(self, host=None) -> str:
         return super()._create_connection_url(
             dialect=f"iris", username=self.username,
-            password=self.password, db_name=self.dbname, host=host,
+            password=self.password, db_name=self.namespace, host=host,
             port=self.port,
         )

tests/test_iris.py

@@ -1,12 +1,30 @@
+import os
 import sqlalchemy
 from testcontainers.iris import IRISContainer
 
+creds = {
+    "username": "test",
+    "password": "test",
+    "namespace": "TEST",
+}
 
-def test_docker_run_iris():
-    iris_container = IRISContainer("intersystemsdc/iris-community:2023.1.1.380.0-zpm")
+
+def check_connection(iris):
+    engine = sqlalchemy.create_engine(iris.get_connection_url())
+    with engine.begin() as connection:
+        result = connection.execute(sqlalchemy.text("select $username, $namespace"))
+        assert result.fetchone() == (creds["username"], creds["namespace"])
+
+
+def test_community():
+    iris_container = IRISContainer("intersystemsdc/iris-community:2023.1.1.380.0-zpm", **creds)
+    with iris_container as iris:
+        check_connection(iris)
+
+
+def test_enterprise():
+    license_key = os.path.abspath(os.path.expanduser("~/iris.key"))
+    iris_container = IRISContainer("containers.intersystems.com/intersystems/iris:2023.3", license_key=license_key,
+                                   **creds)
     with iris_container as iris:
-        engine = sqlalchemy.create_engine(iris.get_connection_url())
-        with engine.begin() as connection:
-            result = connection.execute(sqlalchemy.text("select $zversion"))
-            for row in result:
-                assert "2023.1.1 (Build 380U)" in row[0]
+        check_connection(iris)