From 30ab021110fb2a01752e54e408759cfbee1e8545 Mon Sep 17 00:00:00 2001 From: Eduardo Apolinario <653394+eapolinario@users.noreply.github.com> Date: Wed, 8 Feb 2023 14:00:46 -0800 Subject: [PATCH] Revert "Remove project/domain from being overridden with execution values in serialized context (#1378)" (#1460) * Revert "Remove project/domain from being overridden with execution values in serialized context (#1378)" This reverts commit b3bfef5815623ba3e717540ce700b21d494fefe9. * Import os Signed-off-by: Eduardo Apolinario * Lint Signed-off-by: Eduardo Apolinario --------- Signed-off-by: Eduardo Apolinario Co-authored-by: Eduardo Apolinario --- flytekit/bin/entrypoint.py | 2 ++ .../flytekit/unit/bin/test_python_entrypoint.py | 17 ----------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/flytekit/bin/entrypoint.py b/flytekit/bin/entrypoint.py index fe38f946f9..4f4962309d 100644 --- a/flytekit/bin/entrypoint.py +++ b/flytekit/bin/entrypoint.py @@ -270,6 +270,8 @@ def setup_execution( if compressed_serialization_settings: ss = SerializationSettings.from_transport(compressed_serialization_settings) ssb = ss.new_builder() + ssb.project = exe_project + ssb.domain = exe_domain ssb.version = tk_version if dynamic_addl_distro: ssb.fast_serialization_settings = FastSerializationSettings( diff --git a/tests/flytekit/unit/bin/test_python_entrypoint.py b/tests/flytekit/unit/bin/test_python_entrypoint.py index 6a8b8c430e..6dd1785585 100644 --- a/tests/flytekit/unit/bin/test_python_entrypoint.py +++ b/tests/flytekit/unit/bin/test_python_entrypoint.py @@ -7,7 +7,6 @@ from flyteidl.core.errors_pb2 import ErrorDocument from flytekit.bin.entrypoint import _dispatch_execute, normalize_inputs, setup_execution -from flytekit.configuration import Image, ImageConfig, SerializationSettings from flytekit.core import context_manager from flytekit.core.base_task import IgnoreOutputs from flytekit.core.data_persistence import DiskPersistence @@ -324,22 +323,6 @@ def test_setup_cloud_prefix(): assert isinstance(ctx.file_access._default_remote, GCSPersistence) -def test_persist_ss(): - default_img = Image(name="default", fqn="test", tag="tag") - ss = SerializationSettings( - project="proj1", - domain="dom", - version="version123", - env=None, - image_config=ImageConfig(default_image=default_img, images=[default_img]), - ) - ss_txt = ss.serialized_context - os.environ["_F_SS_C"] = ss_txt - with setup_execution("s3://", checkpoint_path=None, prev_checkpoint=None) as ctx: - assert ctx.serialization_settings.project == "proj1" - assert ctx.serialization_settings.domain == "dom" - - def test_normalize_inputs(): assert normalize_inputs("{{.rawOutputDataPrefix}}", "{{.checkpointOutputPrefix}}", "{{.prevCheckpointPrefix}}") == ( None,