From acc3aa8cc03cff47432ccfcb32212d65ba474c3f Mon Sep 17 00:00:00 2001 From: Othman El Hammouchi Date: Fri, 14 Feb 2025 20:41:21 +0100 Subject: [PATCH 1/2] Change env var disabling security plugin --- modules/opensearch/testcontainers/opensearch/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/opensearch/testcontainers/opensearch/__init__.py b/modules/opensearch/testcontainers/opensearch/__init__.py index 8a02dbb02..0e32b8f4f 100644 --- a/modules/opensearch/testcontainers/opensearch/__init__.py +++ b/modules/opensearch/testcontainers/opensearch/__init__.py @@ -2,11 +2,10 @@ from opensearchpy import OpenSearch from opensearchpy.exceptions import ConnectionError, TransportError -from urllib3.exceptions import ProtocolError - 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 +from urllib3.exceptions import ProtocolError class OpenSearchContainer(DockerContainer): @@ -57,7 +56,7 @@ def __init__( self.with_exposed_ports(self.port) self.with_env("discovery.type", "single-node") - self.with_env("plugins.security.disabled", "false" if security_enabled else "true") + self.with_env("DISABLE_SECURITY_PLUGIN", "false" if security_enabled else "true") if self._supports_initial_admin_password(str(image)): self.with_env("OPENSEARCH_INITIAL_ADMIN_PASSWORD", self.initial_admin_password) if security_enabled: From eabc69bfe588f1ec611140f639ba098b8aad7007 Mon Sep 17 00:00:00 2001 From: David Ankin Date: Mon, 17 Feb 2025 08:29:59 -0500 Subject: [PATCH 2/2] ruff --- modules/opensearch/testcontainers/opensearch/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/opensearch/testcontainers/opensearch/__init__.py b/modules/opensearch/testcontainers/opensearch/__init__.py index 0e32b8f4f..b062f61e7 100644 --- a/modules/opensearch/testcontainers/opensearch/__init__.py +++ b/modules/opensearch/testcontainers/opensearch/__init__.py @@ -2,10 +2,11 @@ from opensearchpy import OpenSearch from opensearchpy.exceptions import ConnectionError, TransportError +from urllib3.exceptions import ProtocolError + 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 -from urllib3.exceptions import ProtocolError class OpenSearchContainer(DockerContainer):