DEVOPS-759 fix: handle timezone awareness in ScratchOrgConfig expiration logic (#11)

* DEVOPS-759 fix: handle timezone awareness in ScratchOrgConfig expiration logic

* DEVOPS-759 fix: update _as_aware_utc method to accept both datetime and date types

Author: dipakparmar

cumulusci/core/config/scratch_org_config.py

@@ -2,7 +2,7 @@
 import json
 import os
 import tempfile
-from typing import List, NoReturn, Optional, TYPE_CHECKING
+from typing import List, NoReturn, Optional, TYPE_CHECKING, Union
 
 import sarge
 
@@ -43,6 +43,17 @@ class ScratchOrgConfig(SfdxOrgConfig):
     org_pool_id: str
 
     createable: bool = True
+    @staticmethod
+    def _as_aware_utc(dt: Union[datetime.datetime, datetime.date]) -> datetime.datetime:
+        """Normalize datetimes to aware UTC for safe comparisons."""
+        if isinstance(dt, datetime.date) and not isinstance(dt, datetime.datetime):
+            dt = datetime.datetime.combine(dt, datetime.time.min)
+
+        tzinfo = getattr(dt, "tzinfo", None)
+        if tzinfo is None or tzinfo.utcoffset(dt) is None:
+            return dt.replace(tzinfo=datetime.timezone.utc)
+
+        return dt.astimezone(datetime.timezone.utc)
 
     @property
     def scratch_info(self):
@@ -68,23 +79,20 @@ def expired(self) -> bool:
         if not expires:
             return False
 
-        if expires.tzinfo is None:
-            expires = expires.replace(tzinfo=datetime.timezone.utc)
-
+        expires = self._as_aware_utc(expires)
         now = datetime.datetime.now(datetime.timezone.utc)
         return expires < now
 
     @property
     def expires(self) -> Optional[datetime.datetime]:
         if self.date_created:
-            return self.date_created + datetime.timedelta(days=int(self.days))
+            expires = self.date_created + datetime.timedelta(days=int(self.days))
+            return self._as_aware_utc(expires)
 
     @property
     def days_alive(self) -> Optional[int]:
         if self.date_created and not self.expired:
-            created = self.date_created
-            if created.tzinfo is None:
-                created = created.replace(tzinfo=datetime.timezone.utc)
+            created = self._as_aware_utc(self.date_created)
             delta = datetime.datetime.now(datetime.timezone.utc) - created
             return delta.days + 1
 

cumulusci/core/config/tests/test_config_expensive.py

@@ -2,7 +2,7 @@
 import os
 import shutil
 import tempfile
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta, timezone, tzinfo
 from pathlib import Path
 from types import SimpleNamespace
 from unittest import mock
@@ -546,14 +546,31 @@ def test_expired(self, Command):
 
     def test_expires(self, Command):
         config = ScratchOrgConfig({"days": 1}, "test")
-        now = datetime.now()
+        now = datetime.now(timezone.utc)
         config.date_created = now
         assert config.expires == now + timedelta(days=1)
 
         config = ScratchOrgConfig({"days": 1}, "test")
         config.date_created = None
         assert config.expires is None
 
+    def test_expired_handles_tzinfo_without_offset(self, Command):
+        class TzinfoWithoutOffset(tzinfo):
+            def utcoffset(self, dt):
+                return None
+
+            def dst(self, dt):
+                return None
+
+            def tzname(self, dt):
+                return "NoneOffset"
+
+        config = ScratchOrgConfig({"days": 1}, "test")
+        config.date_created = datetime(2000, 1, 1, tzinfo=TzinfoWithoutOffset())
+
+        assert config.expired
+        assert config.expires.tzinfo is not None
+
     def test_days_alive(self, Command):
         config = ScratchOrgConfig({}, "test")
         config.date_created = datetime.now()