Skip to content

Commit d1a1abb

Browse files
committed
Updated deps
1 parent 9efc2d2 commit d1a1abb

File tree

2 files changed

+101
-104
lines changed

2 files changed

+101
-104
lines changed

ecs_files_composer/aws_mgmt.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
import re
77

88
import boto3
9-
from boto3 import session
9+
from boto3.session import Session
1010
from botocore.exceptions import ClientError
1111

1212
from ecs_files_composer import input
1313
from ecs_files_composer.common import LOG
1414
from ecs_files_composer.envsubst import expandvars
1515

1616

17-
def create_session_from_creds(tmp_creds, region=None):
17+
def create_session_from_creds(tmp_creds: dict, region: str = None):
1818
"""
1919
Function to easily convert the AssumeRole reply into a boto3 session
2020
:param tmp_creds:
@@ -32,7 +32,7 @@ def create_session_from_creds(tmp_creds, region=None):
3232
return boto3.session.Session(**params)
3333

3434

35-
def set_session_from_iam_object(iam_config_object, source_session=None):
35+
def set_session_from_iam_object(iam_config_object, source_session: Session = None):
3636
"""
3737
Function to define the client session based on config input
3838
@@ -42,15 +42,14 @@ def set_session_from_iam_object(iam_config_object, source_session=None):
4242
:rtype: boto3.session.Session
4343
"""
4444
if source_session is None:
45-
source_session = boto3.session.Session()
45+
source_session = boto3.Session()
4646
if not iam_config_object.access_key_id and not iam_config_object.secret_access_key:
4747
params = {
4848
"RoleArn": iam_config_object.role_arn,
4949
"RoleSessionName": f"{iam_config_object.session_name}@AwsResourceHandlerInit",
5050
}
5151
if iam_config_object.external_id:
5252
params["ExternalId"] = iam_config_object.external_id
53-
print("PA", params)
5453
tmp_creds = source_session.client("sts").assume_role(**params)
5554
client_session = create_session_from_creds(
5655
tmp_creds, region=iam_config_object.region_name
@@ -85,8 +84,8 @@ def __init__(
8584
:param str region:
8685
:param ecs_files_composer.input.IamOverrideDef iam_config_object:
8786
"""
88-
self.session = session.Session()
89-
self.client_session = session.Session()
87+
self.session = Session()
88+
self.client_session = Session()
9089
if client_session_override:
9190
self.client_session = client_session_override
9291
elif not client_session_override and (role_arn or iam_config_object):
@@ -106,7 +105,6 @@ def __init__(
106105
and hasattr(iam_config_object, "role_arn")
107106
and iam_config_object.role_arn
108107
):
109-
print(iam_config_object)
110108
self.client_session = set_session_from_iam_object(
111109
iam_config_object, self.session
112110
)

0 commit comments

Comments
 (0)