diff --git a/src/plugin/connector/base.py b/src/plugin/connector/base.py index 86c92a9..34e8d82 100644 --- a/src/plugin/connector/base.py +++ b/src/plugin/connector/base.py @@ -10,7 +10,7 @@ from spaceone.core.error import * from plugin.conf.cloud_service_conf import * -_LOGGER = logging.getLogger(__name__) +_LOGGER = logging.getLogger("spaceone") DEFAULT_SCHEMA = "google_oauth_client_id" DEFAULT_REGION = "us-east-1" @@ -36,37 +36,42 @@ def get_session(secret_data, region_name): - params = { - "aws_access_key_id": secret_data["aws_access_key_id"], - "aws_secret_access_key": secret_data["aws_secret_access_key"], - "region_name": region_name, - } + try: + params = { + "aws_access_key_id": secret_data["aws_access_key_id"], + "aws_secret_access_key": secret_data["aws_secret_access_key"], + "region_name": region_name, + } - session = Session(**params) + session = Session(**params) - # ASSUME ROLE - if role_arn := secret_data.get("role_arn"): - sts = session.client("sts", verify=BOTO3_HTTPS_VERIFIED) + # ASSUME ROLE + if role_arn := secret_data.get("role_arn"): + sts = session.client("sts", verify=BOTO3_HTTPS_VERIFIED) - _assume_role_request = { - "RoleArn": role_arn, - "RoleSessionName": utils.generate_id("AssumeRoleSession"), - } + _assume_role_request = { + "RoleArn": role_arn, + "RoleSessionName": utils.generate_id("AssumeRoleSession"), + } - if external_id := secret_data.get("external_id"): - _assume_role_request.update({"ExternalId": external_id}) + if external_id := secret_data.get("external_id"): + _assume_role_request.update({"ExternalId": external_id}) - assume_role_object = sts.assume_role(**_assume_role_request) - credentials = assume_role_object["Credentials"] + assume_role_object = sts.assume_role(**_assume_role_request) + credentials = assume_role_object["Credentials"] - assume_role_params = { - "aws_access_key_id": credentials["AccessKeyId"], - "aws_secret_access_key": credentials["SecretAccessKey"], - "region_name": region_name, - "aws_session_token": credentials["SessionToken"], - } - session = Session(**assume_role_params) - return session + assume_role_params = { + "aws_access_key_id": credentials["AccessKeyId"], + "aws_secret_access_key": credentials["SecretAccessKey"], + "region_name": region_name, + "aws_session_token": credentials["SessionToken"], + } + session = Session(**assume_role_params) + return session + except Exception as e: + _LOGGER.debug("Secret Token : "+ str(secret_data)) + _LOGGER.debug("Region : " + region_name) + _LOGGER.error(e) class ResourceConnector(BaseConnector): @@ -195,17 +200,6 @@ def get_regions(cls, secret_data): _session = get_session(secret_data, DEFAULT_REGION) ec2_client = _session.client("ec2", verify=BOTO3_HTTPS_VERIFIED) - try: - _LOGGER.debug("for test") - _LOGGER.debug("secret_data: "+ secret_data) - _LOGGER.debug("result : "+ list( - map( - lambda region_info: region_info.get("RegionName"), - ec2_client.describe_regions().get("Regions"), - ))) - except Exception as e: - _LOGGER.error(e) - return list( map( lambda region_info: region_info.get("RegionName"), diff --git a/src/plugin/main.py b/src/plugin/main.py index 5f71949..c9718c2 100644 --- a/src/plugin/main.py +++ b/src/plugin/main.py @@ -5,7 +5,7 @@ from .conf.cloud_service_conf import DEFAULT_VULNERABLE_PORTS from .manager.base import ResourceManager -_LOGGER = logging.getLogger("cloudforet") +_LOGGER = logging.getLogger("spaceone") app = CollectorPluginServer() diff --git a/src/plugin/manager/base.py b/src/plugin/manager/base.py index 1d0e66a..1698dc3 100644 --- a/src/plugin/manager/base.py +++ b/src/plugin/manager/base.py @@ -11,7 +11,7 @@ from plugin.conf.cloud_service_conf import REGION_INFO from plugin.connector.base import ResourceConnector -_LOGGER = logging.getLogger(__name__) +_LOGGER = logging.getLogger("spaceone") CURRENT_DIR = os.path.dirname(__file__) METRIC_DIR = os.path.join(CURRENT_DIR, "../metrics/") diff --git a/test/api/test_collect.py b/test/api/test_collect.py index 86e81e7..fb8142d 100644 --- a/test/api/test_collect.py +++ b/test/api/test_collect.py @@ -6,7 +6,7 @@ from google.protobuf.json_format import MessageToDict import pprint -_LOGGER = logging.getLogger(__name__) +_LOGGER = Logger(__name__) AKI = os.environ.get("AWS_ACCESS_KEY_ID", None) SAK = os.environ.get("AWS_SECRET_ACCESS_KEY", None)