From 20dad80d3e0d0be16b2e4841e1d681c4108724b8 Mon Sep 17 00:00:00 2001
From: Tobias Bruckert <62531735+tb102122@users.noreply.github.com>
Date: Sat, 22 Jun 2024 15:24:17 +1000
Subject: [PATCH] change function call to new format

---
 .../aft_common/account_provisioning_framework.py          | 8 ++++----
 sources/aft-lambda-layer/aft_common/metrics.py            | 2 +-
 src/aft_lambda/aft_builder/codebuild_trigger.py           | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sources/aft-lambda-layer/aft_common/account_provisioning_framework.py b/sources/aft-lambda-layer/aft_common/account_provisioning_framework.py
index 6642f7a9..7ae88524 100644
--- a/sources/aft-lambda-layer/aft_common/account_provisioning_framework.py
+++ b/sources/aft-lambda-layer/aft_common/account_provisioning_framework.py
@@ -158,8 +158,8 @@ def _put_policy_on_role(
             resource: IAMServiceResource = target_account_session.resource("iam")
             role = resource.Role(role_name)
             role.attach_policy(PolicyArn=policy_arn)
-            timeout = datetime.utcnow() + timedelta(minutes=timeout_in_mins)
-            while datetime.utcnow() < timeout:
+            timeout = datetime.now(datetime.UTC) + timedelta(minutes=timeout_in_mins)
+            while datetime.now(datetime.UTC) < timeout:
                 time.sleep(delay)
                 if self.role_policy_is_attached(
                     role_name=role_name,
@@ -187,8 +187,8 @@ def role_policy_is_attached(
     def _ensure_role_can_be_assumed(
         self, role_name: str, timeout_in_mins: int = 1, delay: int = 5
     ) -> None:
-        timeout = datetime.utcnow() + timedelta(minutes=timeout_in_mins)
-        while datetime.utcnow() < timeout:
+        timeout = datetime.now(datetime.UTC) + timedelta(minutes=timeout_in_mins)
+        while datetime.now(datetime.UTC) < timeout:
             if self._can_assume_role(role_name=role_name):
                 return None
             time.sleep(delay)
diff --git a/sources/aft-lambda-layer/aft_common/metrics.py b/sources/aft-lambda-layer/aft_common/metrics.py
index f7062bad..350f65ec 100644
--- a/sources/aft-lambda-layer/aft_common/metrics.py
+++ b/sources/aft-lambda-layer/aft_common/metrics.py
@@ -82,7 +82,7 @@ def wrap_event_for_api(
     ) -> MetricsPayloadType:
         payload: MetricsPayloadType = {
             "Solution": self.solution_id,
-            "TimeStamp": datetime.utcnow().isoformat(timespec="seconds"),
+            "TimeStamp": datetime.now(datetime.UTC).isoformat(timespec="seconds"),
             "Version": None,
             "UUID": None,
             "Data": {},
diff --git a/src/aft_lambda/aft_builder/codebuild_trigger.py b/src/aft_lambda/aft_builder/codebuild_trigger.py
index f02f3283..482fc922 100644
--- a/src/aft_lambda/aft_builder/codebuild_trigger.py
+++ b/src/aft_lambda/aft_builder/codebuild_trigger.py
@@ -33,8 +33,8 @@ def lambda_handler(event: Dict[str, Any], context: Dict[str, Any]) -> LayerBuild
         time.sleep(30)
 
         # 15min Lambda hard-timeout, soft-timeout at 14min
-        end_time = datetime.datetime.utcnow() + datetime.timedelta(minutes=14)
-        while datetime.datetime.utcnow() <= end_time:
+        end_time = datetime.datetime.now(datetime.UTC) + datetime.timedelta(minutes=14)
+        while datetime.datetime.now(datetime.UTC) <= end_time:
             # We pass exactly 1 job ID, so the build list should contain exactly 1 object
             job_status = client.batch_get_builds(ids=[job_id])["builds"][0][
                 "buildStatus"