Add timezones to all dates

Author: xvaier

packages/flare/bin/cron_job_ingest_events.py

@@ -35,7 +35,7 @@ def main(
     # To avoid cron jobs from doing the same work at the same time, exit new cron jobs if a cron job is already doing work
     last_fetched_timestamp = data_store.get_last_fetch()
     if last_fetched_timestamp and last_fetched_timestamp > (
-        datetime.now() - CRON_JOB_THRESHOLD_SINCE_LAST_FETCH
+        datetime.now(timezone.utc) - CRON_JOB_THRESHOLD_SINCE_LAST_FETCH
     ):
         logger.info(
             f"Fetched events less than {int(CRON_JOB_THRESHOLD_SINCE_LAST_FETCH.seconds / 60)} minutes ago, exiting"
@@ -50,7 +50,7 @@ def main(
     severities_filter = get_severities_filter(storage_passwords=storage_passwords)
     source_types_filter = get_source_types_filter(storage_passwords=storage_passwords)
 
-    data_store.set_last_fetch(datetime.now())
+    data_store.set_last_fetch(datetime.now(timezone.utc))
 
     # If the tenant has changed, update the start date so that future requests will be based off today
     # If you switch tenants, this will avoid the old tenant from ingesting all the events before today and the day
@@ -71,7 +71,7 @@ def main(
         flare_api_cls=flare_api_cls,
         data_store=data_store,
     ):
-        data_store.set_last_fetch(datetime.now())
+        data_store.set_last_fetch(datetime.now(timezone.utc))
 
         data_store.set_next_by_tenant(tenant_id, next_token)
 

packages/flare/tests/bin/test_data_store.py

@@ -1,5 +1,6 @@
 from data_store import ConfigDataStore
 from datetime import datetime
+from datetime import timezone
 
 
 def test_get_and_set_last_tenant_id(data_store: ConfigDataStore) -> None:
@@ -8,13 +9,13 @@ def test_get_and_set_last_tenant_id(data_store: ConfigDataStore) -> None:
 
 
 def test_get_and_set_start_date(data_store: ConfigDataStore) -> None:
-    date = datetime(2024, 3, 6, 12, 0, 0)
+    date = datetime(2024, 3, 6, 12, 0, 0, tzinfo=timezone.utc)
     data_store.set_start_date(date)
     assert data_store.get_start_date() == date
 
 
 def test_get_and_set_last_fetch(data_store: ConfigDataStore) -> None:
-    date = datetime(2024, 3, 6, 14, 0, 0)
+    date = datetime(2024, 3, 6, 14, 0, 0, tzinfo=timezone.utc)
     data_store.set_last_fetch(date)
     assert data_store.get_last_fetch() == date
 

packages/flare/tests/bin/test_ingest_events.py

@@ -102,7 +102,9 @@ def test_main_expect_early_return(
     storage_passwords: FakeStoragePasswords,
     data_store: ConfigDataStore,
 ) -> None:
-    data_store.set_last_fetch(datetime.datetime.fromisoformat("2000-01-01T12:00:00"))
+    data_store.set_last_fetch(
+        datetime.datetime.fromisoformat("2000-01-01T12:00:00+00:00")
+    )
 
     main(
         logger=logger,