Fix Java shared library path for darwin (#11792)

viren-nadkarni · zaingz · commit 8cf2836213f1 · 2024-11-13T15:21:37.000Z
diff --git a/localstack-core/localstack/packages/java.py b/localstack-core/localstack/packages/java.py
@@ -39,6 +39,15 @@ def get_java_home(self) -> str | None:
         """
         return java_package.get_installer().get_java_home()
 
+    def get_java_lib_path(self) -> str | None:
+        """
+        Returns the path to the Java shared library.
+        """
+        if java_home := self.get_java_home():
+            if is_mac_os():
+                return os.path.join(java_home, "Contents", "Home", "lib", "jli", "libjli.dylib")
+            return os.path.join(java_home, "lib", "server", "libjvm.so")
+
     def get_java_env_vars(self, path: str = None, ld_library_path: str = None) -> dict[str, str]:
         """
         Returns environment variables pointing to the Java installation. This is useful to build the environment where
@@ -74,6 +83,8 @@ def __init__(self, version: str):
         super().__init__("java", version, extract_single_directory=True)
 
     def _get_install_marker_path(self, install_dir: str) -> str:
+        if is_mac_os():
+            return os.path.join(install_dir, "Contents", "Home", "bin", "java")
         return os.path.join(install_dir, "bin", "java")
 
     def _get_download_url(self) -> str:
diff --git a/localstack-core/localstack/services/events/event_ruler.py b/localstack-core/localstack/services/events/event_ruler.py
@@ -27,26 +27,23 @@ def start_jvm() -> None:
 
     if not jpype.isJVMStarted():
         jvm_lib, event_ruler_libs_path = get_jpype_lib_paths()
-        event_ruler_libs_pattern = event_ruler_libs_path.joinpath("*")
+        event_ruler_libs_pattern = Path(event_ruler_libs_path).joinpath("*")
 
-        jpype.startJVM(str(jvm_lib), classpath=[event_ruler_libs_pattern])
+        jpype.startJVM(jvm_lib, classpath=[event_ruler_libs_pattern])
 
 
 @cache
-def get_jpype_lib_paths() -> Tuple[Path, Path]:
+def get_jpype_lib_paths() -> Tuple[str, str]:
     """
     Downloads Event Ruler, its dependencies and returns a tuple of:
-    - Path to libjvm.so to be used by JPype as jvmpath. JPype requires this to start the JVM.
+    - Path to libjvm.so/libjli.dylib to be used by JPype as jvmpath. JPype requires this to start the JVM.
         See https://jpype.readthedocs.io/en/latest/userguide.html#path-to-the-jvm
     - Path to Event Ruler libraries to be used by JPype as classpath
     """
     installer = event_ruler_package.get_installer()
     installer.install()
 
-    java_home = installer.get_java_home()
-    jvm_lib = Path(java_home) / "lib" / "server" / "libjvm.so"
-
-    return jvm_lib, Path(installer.get_installed_dir())
+    return installer.get_java_lib_path(), installer.get_installed_dir()
 
 
 def matches_rule(event: str, rule: str) -> bool:
