Skip to content

fix: get_tasks에서 task 생성시 일부 어카운트 누락 수정 (paginator issue) #22

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

Merged
jinyoungmoonDEV merged 1 commit into from
Sep 24, 2025
Merged

fix: get_tasks에서 task 생성시 일부 어카운트 누락 수정 (paginator issue) #22

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
104 changes: 65 additions & 39 deletions src/plugin/connector/aws_s3_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,76 +26,102 @@ def __init__(self, *args, **kwargs):
def create_session(self, options: dict, secret_data: dict, schema: str):
self._check_secret_data(secret_data)

self.s3_bucket = secret_data['aws_s3_bucket']
aws_access_key_id = secret_data['aws_access_key_id']
aws_secret_access_key = secret_data['aws_secret_access_key']
region_name = secret_data.get('region_name')
role_arn = secret_data.get('role_arn')
external_id = secret_data.get('external_id')
self.s3_bucket = secret_data["aws_s3_bucket"]
aws_access_key_id = secret_data["aws_access_key_id"]
aws_secret_access_key = secret_data["aws_secret_access_key"]
region_name = secret_data.get("region_name")
role_arn = secret_data.get("role_arn")
external_id = secret_data.get("external_id")

if role_arn:
self._create_session_aws_assume_role(aws_access_key_id, aws_secret_access_key, region_name,
role_arn, external_id)
self._create_session_aws_assume_role(
aws_access_key_id,
aws_secret_access_key,
region_name,
role_arn,
external_id,
)
else:
self._create_session_aws_access_key(aws_access_key_id, aws_secret_access_key, region_name)
self._create_session_aws_access_key(
aws_access_key_id, aws_secret_access_key, region_name
)

self.s3_client = self.session.client('s3')
self.s3_client = self.session.client("s3")

def list_objects(self, path):
return self.s3_client.list_objects(Bucket=self.s3_bucket, Prefix=path)
def list_objects(self, path, delimiter=None):
params = {"Bucket": self.s3_bucket, "Prefix": path}
if delimiter is not None:
params["Delimiter"] = delimiter

return self.s3_client.list_objects(**params)

def get_cost_data(self, key):
obj = self.s3_client.get_object(Bucket=self.s3_bucket, Key=key)
df = pd.read_parquet(io.BytesIO(obj['Body'].read()))
df = pd.read_parquet(io.BytesIO(obj["Body"].read()))
df = df.replace({np.nan: None})

costs_data = df.to_dict('records')
costs_data = df.to_dict("records")

_LOGGER.debug(f'[get_cost_data] costs count({key}): {len(costs_data)}')
_LOGGER.debug(f"[get_cost_data] costs count({key}): {len(costs_data)}")

# Paginate
page_count = int(len(costs_data) / _PAGE_SIZE) + 1

for page_num in range(page_count):
offset = _PAGE_SIZE * page_num
yield costs_data[offset:offset + _PAGE_SIZE]
yield costs_data[offset : offset + _PAGE_SIZE]

@staticmethod
def _check_secret_data(secret_data):
if 'aws_access_key_id' not in secret_data:
raise ERROR_REQUIRED_PARAMETER(key='secret_data.aws_access_key_id')
if "aws_access_key_id" not in secret_data:
raise ERROR_REQUIRED_PARAMETER(key="secret_data.aws_access_key_id")

if 'aws_secret_access_key' not in secret_data:
raise ERROR_REQUIRED_PARAMETER(key='secret_data.aws_secret_access_key')
if "aws_secret_access_key" not in secret_data:
raise ERROR_REQUIRED_PARAMETER(key="secret_data.aws_secret_access_key")

if 'aws_s3_bucket' not in secret_data:
raise ERROR_REQUIRED_PARAMETER(key='secret_data.aws_s3_bucket')
if "aws_s3_bucket" not in secret_data:
raise ERROR_REQUIRED_PARAMETER(key="secret_data.aws_s3_bucket")

def _create_session_aws_access_key(self, aws_access_key_id, aws_secret_access_key, region_name):
self.session = boto3.Session(aws_access_key_id=aws_access_key_id,
aws_secret_access_key=aws_secret_access_key,
region_name=region_name)
def _create_session_aws_access_key(
self, aws_access_key_id, aws_secret_access_key, region_name
):
self.session = boto3.Session(
aws_access_key_id=aws_access_key_id,
aws_secret_access_key=aws_secret_access_key,
region_name=region_name,
)

sts = self.session.client('sts')
sts = self.session.client("sts")
sts.get_caller_identity()

def _create_session_aws_assume_role(self, aws_access_key_id, aws_secret_access_key, region_name, role_arn, external_id):
self._create_session_aws_access_key(aws_access_key_id, aws_secret_access_key, region_name)
def _create_session_aws_assume_role(
self,
aws_access_key_id,
aws_secret_access_key,
region_name,
role_arn,
external_id,
):
self._create_session_aws_access_key(
aws_access_key_id, aws_secret_access_key, region_name
)

sts = self.session.client('sts')
sts = self.session.client("sts")

_assume_role_request = {
'RoleArn': role_arn,
'RoleSessionName': utils.generate_id('AssumeRoleSession'),
"RoleArn": role_arn,
"RoleSessionName": utils.generate_id("AssumeRoleSession"),
}

if external_id:
_assume_role_request.update({'ExternalId': external_id})
_assume_role_request.update({"ExternalId": external_id})

assume_role_object = sts.assume_role(**_assume_role_request)
credentials = assume_role_object['Credentials']

self.session = boto3.Session(aws_access_key_id=credentials['AccessKeyId'],
aws_secret_access_key=credentials['SecretAccessKey'],
region_name=region_name,
aws_session_token=credentials['SessionToken'])
credentials = assume_role_object["Credentials"]

self.session = boto3.Session(
aws_access_key_id=credentials["AccessKeyId"],
aws_secret_access_key=credentials["SecretAccessKey"],
region_name=region_name,
aws_session_token=credentials["SessionToken"],
)
19 changes: 12 additions & 7 deletions src/plugin/manager/job_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,20 @@ def get_tasks_directory_type(
path = f"SPACE_ONE/billing/database={database}/"

if not accounts:
response = aws_s3_connector.list_objects(path)
for content in response.get("Contents", []):
key = content["Key"]
account_id = key.split("/")[3].split("=")[-1]
response = aws_s3_connector.list_objects(path, delimiter="/")
path_length = len(path)

if account_id and not "":
accounts.append(account_id)
for prefix in response.get("CommonPrefixes", []):
folder = prefix["Prefix"]
relative_path = folder[path_length:].lstrip("/")

if relative_path:
first_folder = relative_path.split("/")[0]
if first_folder.startswith("account_id="):
account_id = first_folder.split("=", 1)[-1]
if account_id and account_id.strip():
accounts.append(account_id)

accounts = list(set(accounts))
for account_id in accounts:
task_options = {
"account_id": account_id,
Expand Down
Loading