Skip to content

change function call to new format #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

change function call to new format #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sources/aft-lambda-layer/aft_common/account_provisioning_framework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion sources/aft-lambda-layer/aft_common/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions src/aft_lambda/aft_builder/codebuild_trigger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down