Skip to content

Fix CloudRunExecuteJobOperator logging links in deferred mode #56234

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

Closed
steveahnahn wants to merge 1 commit into from
Closed

Fix CloudRunExecuteJobOperator logging links in deferred mode #56234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion providers/google/src/airflow/providers/google/cloud/links/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,12 @@ def persist(cls, context: Context, **value):
def get_config(self, operator, ti_key):
conf = {}
conf.update(getattr(operator, "extra_links_params", {}))
conf.update(XCom.get_value(key=self.key, ti_key=ti_key) or {})

xcom_value = XCom.get_value(key=self.key, ti_key=ti_key) or {}
if isinstance(xcom_value, str):
xcom_value = {self.key: xcom_value}

conf.update(xcom_value)

# if the config did not define, return None to stop URL formatting
if not conf:
Expand Down
32 changes: 32 additions & 0 deletions providers/google/tests/unit/google/cloud/links/test_base_link.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,35 @@ def test_get_link(self, create_task_instance_of_operator, session, mock_supervis
)
actual_url = link.get_link(operator=ti.task, ti_key=ti.key)
assert actual_url == expected_url

def test_get_config_with_string_xcom_value(self):
link = GoogleLink()

mock_operator = mock.MagicMock()
mock_operator.extra_links_params = {}

mock_ti_key = mock.MagicMock()

test_string_value = "some_string_value"

with mock.patch("airflow.providers.google.cloud.links.base.XCom.get_value") as mock_get_value:
# Test case 1: XCom returns a string
mock_get_value.return_value = test_string_value
config = link.get_config(mock_operator, mock_ti_key)

expected_config = {link.key: test_string_value, "namespace": "default"}
assert config == expected_config

# Test case 2: XCom returns a dictionary (normal case)
test_dict_value = {"key1": "value1", "key2": "value2"}
mock_get_value.return_value = test_dict_value
config = link.get_config(mock_operator, mock_ti_key)

expected_config = {**test_dict_value, "namespace": "default"}
assert config == expected_config

# Test case 3: XCom returns None
mock_get_value.return_value = None
config = link.get_config(mock_operator, mock_ti_key)

assert config is None
Loading