Skip to content

Ship StepFunction JSONata dependency by default #12110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 9, 2025
Merged

Ship StepFunction JSONata dependency by default #12110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fe233dc
Make JPype JSONata package installable
joe4dev Jan 7, 2025
f4170f6
Install jpype-jsonata lpm package by default
joe4dev Jan 7, 2025
b90570e
Clarify help for mount-source dev run
joe4dev Jan 7, 2025
3093c57
Unify JRE version with dynamodb-local
joe4dev Jan 7, 2025
81565cc
Fix missing installer versions method
joe4dev Jan 7, 2025
bef9653
Revert back to default JRE 11 to mitigate conflict
joe4dev Jan 8, 2025
a748b1a
Re-introduce and clarify Jackson dependency
joe4dev Jan 8, 2025
c3b502c
Retry sharing JRE after restoring the required dependency
joe4dev Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ RUN --mount=type=cache,target=/root/.cache \
source .venv/bin/activate && \
python -m localstack.cli.lpm install \
lambda-runtime \
jpype-jsonata \
dynamodb-local && \
chown -R localstack:localstack /usr/lib/localstack && \
chmod -R 777 /usr/lib/localstack
Expand Down
4 changes: 2 additions & 2 deletions localstack-core/localstack/dev/run/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
type=str,
required=False,
help="Overwrite the container image to be used (defaults to localstack/localstack or "
"localstack/localstack-pro.",
"localstack/localstack-pro).",
)
@click.option(
"--volume-dir",
Expand Down Expand Up @@ -66,7 +66,7 @@
"--mount-source/--no-mount-source",
is_flag=True,
default=True,
help="Mount source files from localstack, localstack-ext, and moto into the container.",
help="Mount source files from localstack and localstack-ext. Use --local-packages for optional dependencies such as moto.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

)
@click.option(
"--mount-dependencies/--no-mount-dependencies",
Expand Down
10 changes: 6 additions & 4 deletions localstack-core/localstack/services/stepfunctions/asl/jsonata/jsonata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import jpype
import jpype.imports

from localstack.services.stepfunctions.asl.jsonata.packages import jsonata_package
from localstack.services.stepfunctions.asl.utils.encoding import to_json_str
from localstack.services.stepfunctions.packages import jpype_jsonata_package
from localstack.utils.objects import singleton_factory

JSONataExpression = str
Expand Down Expand Up @@ -40,17 +40,19 @@ class _JSONataJVMBridge:
_java_JSONATA: "com.dashjoin.jsonata.Jsonata.jsonata" # noqa

def __init__(self):
installer = jsonata_package.get_installer()
installer = jpype_jsonata_package.get_installer()
installer.install()

from jpype import config as jpype_config

jpype_config.destroy_jvm = False

# Limitation: We can only start one JVM instance within LocalStack and using JPype for another purpose
# (e.g., event-ruler) fails unless we change the way we load/reload the classpath.
jvm_path = installer.get_java_lib_path()
jsonata_libs_path = Path(installer.get_installed_dir())
event_ruler_libs_pattern = jsonata_libs_path.joinpath("*")
jpype.startJVM(jvm_path, classpath=[event_ruler_libs_pattern], interrupt=False)
jsonata_libs_pattern = jsonata_libs_path.joinpath("*")
jpype.startJVM(jvm_path, classpath=[jsonata_libs_pattern], interrupt=False)

from com.fasterxml.jackson.databind import ObjectMapper # noqa
from com.dashjoin.jsonata.Jsonata import jsonata # noqa
Expand Down
8 changes: 7 additions & 1 deletion ...ces/stepfunctions/asl/jsonata/packages.py → ...lstack/services/stepfunctions/packages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ class JSONataPackage(Package):
def __init__(self):
super().__init__("JSONataLibs", JSONATA_DEFAULT_VERSION)

# Match the dynamodb-local JRE version to reduce the LocalStack image size by sharing the same JRE version
self.java_version = "21"

def get_versions(self) -> list[str]:
return list(JSONATA_JACKSON_VERSION_STORE.keys())

Expand All @@ -24,10 +27,13 @@ def __init__(self, version: str):
jackson_version = JSONATA_JACKSON_VERSION_STORE[version]
super().__init__(
f"pkg:maven/com.dashjoin/jsonata@{version}",
# jackson-databind is imported in jsonata.py as "from com.fasterxml.jackson.databind import ObjectMapper"
# jackson-annotations and jackson-core are dependencies of jackson-databind:
# https://central.sonatype.com/artifact/com.fasterxml.jackson.core/jackson-databind/dependencies
f"pkg:maven/com.fasterxml.jackson.core/jackson-core@{jackson_version}",
f"pkg:maven/com.fasterxml.jackson.core/jackson-annotations@{jackson_version}",
f"pkg:maven/com.fasterxml.jackson.core/jackson-databind@{jackson_version}",
)


jsonata_package = JSONataPackage()
jpype_jsonata_package = JSONataPackage()
9 changes: 9 additions & 0 deletions localstack-core/localstack/services/stepfunctions/plugins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from localstack.packages import Package, package


@package(name="jpype-jsonata")
def jpype_jsonata_package() -> Package:
"""The Java-based jsonata library uses JPype and depends on a JVM installation."""
from localstack.services.stepfunctions.packages import jpype_jsonata_package

return jpype_jsonata_package
Loading