SIENTIAPDE-1325
SIENTIAPDE-1325 Update release workflow to trigger only on merged pull requests and adjust timestamp formatting in tests for consistency.
This commit is contained in:
1
.github/workflows/release.yml
vendored
1
.github/workflows/release.yml
vendored
@@ -8,6 +8,7 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
release:
|
||||||
|
if: github.event.pull_request.merged == true
|
||||||
uses: Aignosi/github_workflow_templates/.github/workflows/dataops-module-release.yml@main
|
uses: Aignosi/github_workflow_templates/.github/workflows/dataops-module-release.yml@main
|
||||||
permissions: write-all
|
permissions: write-all
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -10,7 +10,11 @@ with workflow.unsafe.imports_passed_through():
|
|||||||
from sientia_do.notifications.models import NotificationLevel
|
from sientia_do.notifications.models import NotificationLevel
|
||||||
from sientia_do.observability.sientia_monitoring import MetricsController, SientiaMonitoring
|
from sientia_do.observability.sientia_monitoring import MetricsController, SientiaMonitoring
|
||||||
from sientia_do.repository.mongodb_repository import MongoDBRepository
|
from sientia_do.repository.mongodb_repository import MongoDBRepository
|
||||||
from sientia_do.temporal.constants import DATETIME_FORMAT_WITH_TZ, DATETIME_FORMAT_MS_WITH_TZ, now
|
from sientia_do.temporal.constants import (
|
||||||
|
DATETIME_FORMAT_MS_WITH_TZ,
|
||||||
|
DATETIME_FORMAT_WITH_TZ,
|
||||||
|
now,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class MongoDB(SientiaMonitoring):
|
class MongoDB(SientiaMonitoring):
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ from unittest.mock import ANY, AsyncMock, MagicMock, patch
|
|||||||
|
|
||||||
from pytest import fixture, mark
|
from pytest import fixture, mark
|
||||||
from sientia_do.notifications.models import NotificationLevel
|
from sientia_do.notifications.models import NotificationLevel
|
||||||
from sientia_do.temporal.constants import DATETIME_FORMAT_MS_WITH_TZ
|
from sientia_do.temporal.constants import DATETIME_FORMAT_MS_WITH_TZ, DATETIME_FORMAT_WITH_TZ
|
||||||
|
|
||||||
from orchestrator.activities.mongo_db import MongoDB
|
from orchestrator.activities.mongo_db import MongoDB
|
||||||
|
|
||||||
@@ -479,9 +479,7 @@ async def test_load_latest_data_none_last_data_timestamp(mongo_db):
|
|||||||
{
|
{
|
||||||
'name': 'test1',
|
'name': 'test1',
|
||||||
'value': 1,
|
'value': 1,
|
||||||
'timestamp': datetime.strptime(
|
'timestamp': '2023-01-01 12:00:00+0000',
|
||||||
'2023-01-01 12:00:00.000000+0000', DATETIME_FORMAT_MS_WITH_TZ
|
|
||||||
),
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
@@ -501,7 +499,7 @@ async def test_load_latest_data_none_last_data_timestamp(mongo_db):
|
|||||||
{'workflow_name': 'test_pipeline', 'schedule_name': 'test_schedule'},
|
{'workflow_name': 'test_pipeline', 'schedule_name': 'test_schedule'},
|
||||||
)
|
)
|
||||||
|
|
||||||
assert result == [{'name': 'test1', 'value': 1, 'timestamp': '2023-01-01 12:00:00.000000+0000'}]
|
assert result == [{'name': 'test1', 'value': 1, 'timestamp': '2023-01-01 12:00:00+0000'}]
|
||||||
|
|
||||||
|
|
||||||
@mark.asyncio
|
@mark.asyncio
|
||||||
@@ -513,9 +511,7 @@ async def test_load_latest_data_not_none_last_data_timestamp(mongo_db):
|
|||||||
{
|
{
|
||||||
'name': 'test1',
|
'name': 'test1',
|
||||||
'value': 1,
|
'value': 1,
|
||||||
'timestamp': datetime.strptime(
|
'timestamp': '2023-01-01 12:00:00+0000',
|
||||||
'2023-01-01 12:00:00.000000+0000', DATETIME_FORMAT_MS_WITH_TZ
|
|
||||||
),
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
@@ -524,7 +520,7 @@ async def test_load_latest_data_not_none_last_data_timestamp(mongo_db):
|
|||||||
{
|
{
|
||||||
'metadata': {'workflow_name': 'test_pipeline', 'schedule_name': 'test_schedule'},
|
'metadata': {'workflow_name': 'test_pipeline', 'schedule_name': 'test_schedule'},
|
||||||
'collection_name': 'test_collection',
|
'collection_name': 'test_collection',
|
||||||
'last_data_timestamp': '2023-01-01 12:00:00.000000+0000',
|
'last_data_timestamp': '2023-01-01 12:00:00+0000',
|
||||||
'base_data_filter': {'level': 'ERROR'},
|
'base_data_filter': {'level': 'ERROR'},
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@@ -534,15 +530,13 @@ async def test_load_latest_data_not_none_last_data_timestamp(mongo_db):
|
|||||||
{
|
{
|
||||||
'level': 'ERROR',
|
'level': 'ERROR',
|
||||||
'timestamp': {
|
'timestamp': {
|
||||||
'$gt': datetime.strptime(
|
'$gt': datetime.strptime('2023-01-01 12:00:00+0000', DATETIME_FORMAT_WITH_TZ)
|
||||||
'2023-01-01 12:00:00.000000+0000', DATETIME_FORMAT_MS_WITH_TZ
|
|
||||||
)
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{'workflow_name': 'test_pipeline', 'schedule_name': 'test_schedule'},
|
{'workflow_name': 'test_pipeline', 'schedule_name': 'test_schedule'},
|
||||||
)
|
)
|
||||||
|
|
||||||
assert result == [{'name': 'test1', 'value': 1, 'timestamp': '2023-01-01 12:00:00.000000+0000'}]
|
assert result == [{'name': 'test1', 'value': 1, 'timestamp': '2023-01-01 12:00:00+0000'}]
|
||||||
|
|
||||||
|
|
||||||
@mark.asyncio
|
@mark.asyncio
|
||||||
@@ -555,7 +549,7 @@ async def test_load_latest_data_error(mongo_db):
|
|||||||
{
|
{
|
||||||
'metadata': {'workflow_name': 'test_pipeline', 'schedule_name': 'test_schedule'},
|
'metadata': {'workflow_name': 'test_pipeline', 'schedule_name': 'test_schedule'},
|
||||||
'collection_name': 'test_collection',
|
'collection_name': 'test_collection',
|
||||||
'last_data_timestamp': '2023-01-01 12:00:00.000000+0000',
|
'last_data_timestamp': '2023-01-01 12:00:00+0000',
|
||||||
'base_data_filter': {'level': 'ERROR'},
|
'base_data_filter': {'level': 'ERROR'},
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user