Merge pull request #2679 from Ennovate-com/fix/timezone-aware-utc

Fix: Change To Use Timezone Aware UTC datetime

aries_cloudagent/messaging/util.py

@@ -95,7 +95,7 @@ def epoch_to_str(epoch: int) -> str:
 
 def datetime_now() -> datetime:
     """Timestamp in UTC."""
-    return datetime.utcnow().replace(tzinfo=timezone.utc)
+    return datetime.now(tz=timezone.utc)
 
 
 def time_now() -> str:

aries_cloudagent/multitenant/base.py

@@ -1,7 +1,7 @@
 """Manager for multitenancy."""
 
 from abc import ABC, abstractmethod
-from datetime import datetime
+from datetime import datetime, timezone
 import logging
 from typing import Iterable, List, Optional, cast, Tuple
 
@@ -297,7 +297,7 @@ async def create_auth_token(
             str: JWT auth token
 
         """
-        iat = int(round(datetime.utcnow().timestamp()))
+        iat = int(round(datetime.now(tz=timezone.utc).timestamp()))
 
         jwt_payload = {"wallet_id": wallet_record.wallet_id, "iat": iat}
         jwt_secret = self._profile.settings.get("multitenant.jwt_secret")

aries_cloudagent/multitenant/tests/test_base.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 
 from unittest import IsolatedAsyncioTestCase
 from aries_cloudagent.tests import mock
@@ -374,15 +374,15 @@ async def test_create_auth_token_managed(self):
             save=mock.CoroutineMock(),
         )
 
-        utc_now = datetime(2020, 1, 1, 0, 0, 0)
+        utc_now = datetime(2020, 1, 1, 0, 0, 0, tzinfo=timezone.utc)
         iat = int(round(utc_now.timestamp()))
 
         expected_token = jwt.encode(
             {"wallet_id": wallet_record.wallet_id, "iat": iat}, "very_secret_jwt"
         )
 
         with mock.patch.object(test_module, "datetime") as mock_datetime:
-            mock_datetime.utcnow.return_value = utc_now
+            mock_datetime.now.return_value = utc_now
             token = await self.manager.create_auth_token(wallet_record)
 
         assert wallet_record.jwt_iat == iat
@@ -398,7 +398,7 @@ async def test_create_auth_token_unmanaged(self):
             save=mock.CoroutineMock(),
         )
 
-        utc_now = datetime(2020, 1, 1, 0, 0, 0)
+        utc_now = datetime(2020, 1, 1, 0, 0, 0, tzinfo=timezone.utc)
         iat = int(round(utc_now.timestamp()))
 
         expected_token = jwt.encode(
@@ -411,7 +411,7 @@ async def test_create_auth_token_unmanaged(self):
         )
 
         with mock.patch.object(test_module, "datetime") as mock_datetime:
-            mock_datetime.utcnow.return_value = utc_now
+            mock_datetime.now.return_value = utc_now
             token = await self.manager.create_auth_token(wallet_record, "test_key")
 
         assert wallet_record.jwt_iat == iat

aries_cloudagent/protocols/out_of_band/v1_0/tests/test_manager.py

@@ -102,7 +102,7 @@ class TestConfig:
         routing_keys=[],
         service_endpoint=test_endpoint,
     )
-    NOW_8601 = datetime.utcnow().replace(tzinfo=timezone.utc).isoformat(" ", "seconds")
+    NOW_8601 = datetime.now(tz=timezone.utc).isoformat(" ", "seconds")
     TEST_INVI_MESSAGE_TYPE = "out-of-band/1.1/invitation"
     NOW_EPOCH = str_to_epoch(NOW_8601)
     CD_ID = "GMm4vMw8LLrLJjp81kRRLp:3:CL:12:tag"

aries_cloudagent/protocols/present_proof/v1_0/messages/tests/test_presentation_request.py

@@ -12,7 +12,7 @@
 from ..presentation_request import PresentationRequest
 
 
-NOW_8601 = datetime.utcnow().replace(tzinfo=timezone.utc).isoformat(" ", "seconds")
+NOW_8601 = datetime.now(tz=timezone.utc).isoformat(" ", "seconds")
 NOW_EPOCH = str_to_epoch(NOW_8601)
 CD_ID = "GMm4vMw8LLrLJjp81kRRLp:3:CL:12:tag"
 INDY_PROOF_REQ = json.loads(

aries_cloudagent/resolver/did_resolver.py

@@ -5,7 +5,7 @@
 """
 
 import asyncio
-from datetime import datetime
+from datetime import datetime, timezone
 from itertools import chain
 import logging
 from typing import List, Optional, Sequence, Text, Tuple, Union
@@ -91,11 +91,11 @@ async def resolve_with_metadata(
         self, profile: Profile, did: Union[str, DID], *, timeout: Optional[int] = None
     ) -> ResolutionResult:
         """Resolve a DID and return the ResolutionResult."""
-        resolution_start_time = datetime.utcnow()
+        resolution_start_time = datetime.now(tz=timezone.utc)
 
         resolver, doc = await self._resolve(profile, did, timeout=timeout)
 
-        time_now = datetime.utcnow()
+        time_now = datetime.now(tz=timezone.utc)
         duration = int((time_now - resolution_start_time).total_seconds() * 1000)
         retrieved_time = time_now.strftime("%Y-%m-%dT%H:%M:%SZ")
         resolver_metadata = ResolutionMetadata(