Skip to content

🐛 Fixes issue with parsing logs polluting sidecar logs #6442

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 5 commits into from
Sep 26, 2024
Merged

🐛 Fixes issue with parsing logs polluting sidecar logs #6442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dba10b5
adds edge case
Sep 25, 2024
d468717
refactor
Sep 25, 2024
19b08f0
Merge remote-tracking branch 'upstream/master' into pr-osparc-log-par…
Sep 25, 2024
62377c9
Merge branch 'master' into pr-osparc-log-parsing-issues
GitHK Sep 25, 2024
5145784
Merge branch 'master' into pr-osparc-log-parsing-issues
GitHK Sep 26, 2024
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 packages/simcore-sdk/src/simcore_sdk/node_ports_common/r_clone_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class _RCloneSyncTransferringMessage(_RCloneSyncMessageBase):
_RCloneSyncTransferCompletedMessage,
_RCloneSyncUpdatedMessage,
_RCloneSyncTransferringMessage,
_RCloneSyncMessageBase,
]


Expand Down
75 changes: 75 additions & 0 deletions packages/simcore-sdk/tests/unit/test_node_ports_common_r_clone_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import json
from unittest.mock import AsyncMock

import pytest
from pydantic import parse_raw_as
from simcore_sdk.node_ports_common.r_clone_utils import (
SyncProgressLogParser,
_RCloneSyncMessageBase,
_RCloneSyncMessages,
_RCloneSyncTransferCompletedMessage,
_RCloneSyncTransferringMessage,
_RCloneSyncUpdatedMessage,
)


@pytest.mark.parametrize(
"log_message,expected",
[
(
'{"level":"info","msg":"There was nothing to transfer","source":"sync/sync.go:954","time":"2024-09-25T10:18:04.904537+00:00"}',
_RCloneSyncMessageBase,
),
(
'{"level":"info","msg":"","object":".hidden_do_not_remove","objectType":"*s3.Object","source":"operations/operations.go:277","time":"2024-09-24T07:11:22.147117+00:00"}',
_RCloneSyncUpdatedMessage,
),
(
'{"level":"info","msg":"Copied (new)","object":"README.ipynb","objectType":"*s3.Object","size":5123,"source":"operations/copy.go:360","time":"2024-04-23T14:05:10.408277+00:00"}',
_RCloneSyncTransferCompletedMessage,
),
(
json.dumps(
{
"level": "",
"msg": "",
"source": "",
"time": "2024-09-24T07:11:22.147117+00:00",
"object": "str",
}
),
_RCloneSyncUpdatedMessage,
),
(
json.dumps(
{
"level": "",
"msg": "",
"source": "",
"time": "2024-09-24T07:11:22.147117+00:00",
"object": "str",
"size": 1,
}
),
_RCloneSyncTransferCompletedMessage,
),
(
json.dumps(
{
"level": "",
"msg": "",
"source": "",
"time": "2024-09-24T07:11:22.147117+00:00",
"stats": {"bytes": 1, "totalBytes": 1},
}
),
_RCloneSyncTransferringMessage,
),
],
)
async def test_rclone_stbc_message_parsing_regression(log_message: str, expected: type):
parsed_log = parse_raw_as(_RCloneSyncMessages, log_message) # type: ignore[arg-type]
assert isinstance(parsed_log, expected)

progress_log_parser = SyncProgressLogParser(AsyncMock())
await progress_log_parser(log_message)
Loading