10000 Use get_install_dir() instead of _get_install_dir() · localstack/localstack@7eb8868 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7eb8868

Browse files
viren-nadkarniviren-nadkarni
committed
Use get_install_dir() instead of _get_install_dir()
1 parent 194e4ba commit 7eb8868

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

‎localstack-core/localstack/services/opensearch/cluster.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
)
1717
from localstack.http.client import SimpleRequestsClient
1818
from localstack.http.proxy import ProxyHandler
19-
from localstack.packages import InstallTarget
2019
from localstack.services.edge import ROUTER
2120
from localstack.services.opensearch import versions
2221
from localstack.services.opensearch.packages import elasticsearch_package, opensearch_package
@@ -670,7 +669,7 @@ def os_user(self):
670669
return constants.OS_USER_OPENSEARCH
671670

672671
def _ensure_installed(self):
673-
elasticsearch_package.install(self.version, target=InstallTarget.VAR_LIBS)
672+
elasticsearch_package.install(self.version)
674673

675674
def _base_settings(self, dirs) -> CommandSettings:
676675
settings = {
@@ -702,9 +701,7 @@ def _base_settings(self, dirs) -> CommandSettings:
702701

703702
def _create_env_vars(self, directories: Directories) -> Dict:
704703
return {
705-
**elasticsearch_package.get_installer(self.version).get_java_env_vars(
706-
InstallTarget.VAR_LIBS
707-
),
704+
**elasticsearch_package.get_installer(self.version).get_java_env_vars(),
708705
"ES_JAVA_OPTS": os.environ.get("ES_JAVA_OPTS", "-Xms200m -Xmx600m"),
709706
"ES_TMPDIR": directories.tmp,
710707
}

‎localstack-core/localstack/services/opensearch/packages.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ class ElasticsearchPackageInstaller(PackageInstaller):
236236
def __init__(self, version: str):
237237
super().__init__("elasticsearch", version)
238238

239-
def get_java_env_vars(self, target: InstallTarget) -> dict[str, str]:
240-
install_dir = self._get_install_dir(target)
239+
def get_java_env_vars(self) -> dict[str, str]:
240+
install_dir = self.get_install_dir()
241241
return {
242242
"JAVA_HOME": os.path.join(install_dir, "jdk"),
243243
}
@@ -272,7 +272,7 @@ def _install(self, target: InstallTarget):
272272
**java_system_properties_proxy(),
273273
**java_system_properties_ssl(
274274
os.path.join(install_dir, "jdk", "bin", "keytool"),
275-
self.get_java_env_vars(target),
275+
self.get_java_env_vars(),
276276
),
277277
}
278278
java_opts = system_properties_to_cli_args(sys_props)
@@ -361,7 +361,7 @@ class ElasticsearchLegacyPackageInstaller(ElasticsearchPackageInstaller):
361361
def _prepare_installation(self, target: InstallTarget) -> None:
362362
java_package.get_installer(self.JAVA_VERSION).install(target)
363363

364-
def get_java_env_vars(self, target: InstallTarget) -> dict[str, str]:
364+
def get_java_env_vars(self) -> dict[str, str]:
365365
return {
366366
"JAVA_HOME": java_package.get_installer(self.JAVA_VERSION).get_java_home(),
367367
}

0 commit comments

Comments
 (0)
0