Merge branch 'mr/trespeuch/ruff' into 'master'

Fix ruff DTZ violations

See merge request it/e3-aws!133

Author: pierretr

src/e3/aws/cfn/__init__.py

@@ -7,6 +7,15 @@
 import time
 import uuid
 from datetime import datetime
+
+try:
+    from datetime import UTC
+except ImportError:
+    # Python < 3.11 does not have datetime.UTC
+    from datetime import timezone
+
+    UTC = timezone.utc
+
 from enum import Enum
 
 import botocore.client
@@ -490,7 +499,7 @@ def __init__(
                 "deploying the stack (see Stack cfn_role_arn parameter)"
             )
         self.cfn_role_arn = cfn_role_arn
-        self.creation_date = datetime.now().timestamp()
+        self.creation_date = datetime.now(tz=UTC).timestamp()
 
         # The uuid is used by create and create_change_set. It allows then
         # to track for example events associated with that deployment

src/e3/aws/cfn/main.py

@@ -11,6 +11,16 @@
 import tempfile
 import time
 from datetime import datetime
+
+try:
+    from datetime import UTC
+except ImportError:
+    # Python < 3.11 does not have datetime.UTC
+    from datetime import timezone
+
+    UTC = timezone.utc
+
+
 from pathlib import Path
 
 import botocore.exceptions
@@ -171,7 +181,7 @@ def __init__(
         self.aws_env: Session | AWSEnv | None = None
         self.deploy_branch = deploy_branch
 
-        self.timestamp = datetime.utcnow().strftime("%Y-%m-%d/%H:%M:%S.%f")
+        self.timestamp = datetime.now(tz=UTC).strftime("%Y-%m-%d/%H:%M:%S.%f")
 
         if s3_bucket is not None:
             s3_root_key = f"{s3_key.strip('/')}/"

src/e3/aws/ec2/ami.py

@@ -5,6 +5,15 @@
 import re
 from datetime import datetime
 
+try:
+    from datetime import UTC
+except ImportError:
+    # Python < 3.11 does not have datetime.UTC
+    from datetime import timezone
+
+    UTC = timezone.utc
+
+
 from dateutil.parser import parse as parse_date
 
 from e3.aws import session
@@ -67,12 +76,15 @@ def creation_date(self) -> datetime:
 
         :return: AMI creation date
         """
-        return parse_date(self.data["CreationDate"]).replace(tzinfo=None)
+        creation_date = parse_date(self.data["CreationDate"])
+        if creation_date.tzinfo is None:
+            creation_date = creation_date.replace(tzinfo=UTC)
+        return creation_date
 
     @property
     def age(self) -> int:
         """Return age of the AMI in days."""
-        age = datetime.now() - self.creation_date
+        age = datetime.now(tz=UTC) - self.creation_date
         return int(age.total_seconds() / (3600 * 24))
 
     @property

tests/tests_e3_aws/cfn/main/main_test.py

@@ -4,6 +4,15 @@
 
 import textwrap
 from datetime import datetime
+
+try:
+    from datetime import UTC
+except ImportError:
+    # Python < 3.11 does not have datetime.UTC
+    from datetime import timezone
+
+    UTC = timezone.utc
+
 from pathlib import Path
 
 import pytest
@@ -129,7 +138,7 @@ def create_stack(self) -> list[Stack]:
                 "Stacks": [
                     {
                         "StackName": stack_name,
-                        "CreationTime": datetime(2016, 1, 20, 22, 9),
+                        "CreationTime": datetime(2016, 1, 20, 22, 9, tzinfo=UTC),
                         "StackStatus": "CREATE_COMPLETE",
                         "StackId": stack_name + "1",
                     }
@@ -174,7 +183,7 @@ def create_stack(self) -> list[Stack]:
                     "Stacks": [
                         {
                             "StackName": stack_name,
-                            "CreationTime": datetime(2016, 1, 20, 22, 9),
+                            "CreationTime": datetime(2016, 1, 20, 22, 9, tzinfo=UTC),
                             "StackStatus": "UPDATE_COMPLETE",
                             "StackId": stack_name + "1",
                         }

tests/tests_e3_aws/session/session_test.py

@@ -4,6 +4,14 @@
 
 from datetime import datetime
 
+try:
+    from datetime import UTC
+except ImportError:
+    # Python < 3.11 does not have datetime.UTC
+    from datetime import timezone
+
+    UTC = timezone.utc
+
 import pytest
 
 from e3.aws import AWSEnv, AWSSessionRunError, Session
@@ -28,7 +36,7 @@ def test_run(capfd: CaptureFixture) -> None:
                     "AccessKeyId": "12345678912345678",
                     "SecretAccessKey": "12345678912345678",
                     "SessionToken": "12345678912345678",
-                    "Expiration": datetime(4042, 1, 1),
+                    "Expiration": datetime(4042, 1, 1, tzinfo=UTC),
                 }
             },
             {