From 77ad303506831a1d1435c2ed6fb1ca9d7cd60c49 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 1 Jul 2022 14:57:43 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=96=E3=81=AE=E3=83=A2=E3=82=B8?= =?UTF-8?q?=E3=83=A5=E3=83=BC=E3=83=AB=E3=80=81=E5=90=8C=E9=9A=8E=E5=B1=A4?= =?UTF-8?q?=E3=81=AB=E7=84=A1=E3=81=84=E3=81=A8=E3=81=A0=E3=82=81=E3=81=A3?= =?UTF-8?q?=E3=81=BD=E3=81=84.=E3=81=BE=E3=81=A0=E5=8B=95=E3=81=8B?= =?UTF-8?q?=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lambda/check-view-secutiry-option/Dockerfile | 3 +-- .../system_vars => check-view-option}/constants.py | 0 .../environments.py | 0 .../exceptions.py} | 4 ++++ .../{ => check-view-option}/main.py | 10 +++++----- .../medaca_logger.py} | 14 +++++++------- .../src/error/file_not_found_exception.py | 5 ----- 7 files changed, 17 insertions(+), 19 deletions(-) rename lambda/check-view-secutiry-option/{src/system_vars => check-view-option}/constants.py (100%) rename lambda/check-view-secutiry-option/{src/system_vars => check-view-option}/environments.py (100%) rename lambda/check-view-secutiry-option/{src/error/madaca_exception.py => check-view-option/exceptions.py} (77%) rename lambda/check-view-secutiry-option/{ => check-view-option}/main.py (57%) rename lambda/check-view-secutiry-option/{src/logger/logger.py => check-view-option/medaca_logger.py} (75%) delete mode 100644 lambda/check-view-secutiry-option/src/error/file_not_found_exception.py diff --git a/lambda/check-view-secutiry-option/Dockerfile b/lambda/check-view-secutiry-option/Dockerfile index 637e1e0c..681c462a 100644 --- a/lambda/check-view-secutiry-option/Dockerfile +++ b/lambda/check-view-secutiry-option/Dockerfile @@ -8,8 +8,7 @@ COPY Pipfile Pipfile.lock ${WORKDIR} RUN pip install pipenv --no-cache-dir && \ pipenv install --system --deploy && \ pip uninstall -y pipenv virtualenv-clone virtualenv -COPY ./src $WORKDIRsrc -COPY main.py $WORKDIR +COPY check-view-option ./ ENTRYPOINT [ "/usr/local/bin/python", "-m", "awslambdaric" ] CMD [ "main.handler" ] diff --git a/lambda/check-view-secutiry-option/src/system_vars/constants.py b/lambda/check-view-secutiry-option/check-view-option/constants.py similarity index 100% rename from lambda/check-view-secutiry-option/src/system_vars/constants.py rename to lambda/check-view-secutiry-option/check-view-option/constants.py diff --git a/lambda/check-view-secutiry-option/src/system_vars/environments.py b/lambda/check-view-secutiry-option/check-view-option/environments.py similarity index 100% rename from lambda/check-view-secutiry-option/src/system_vars/environments.py rename to lambda/check-view-secutiry-option/check-view-option/environments.py diff --git a/lambda/check-view-secutiry-option/src/error/madaca_exception.py b/lambda/check-view-secutiry-option/check-view-option/exceptions.py similarity index 77% rename from lambda/check-view-secutiry-option/src/error/madaca_exception.py rename to lambda/check-view-secutiry-option/check-view-option/exceptions.py index b79129ae..131a0126 100644 --- a/lambda/check-view-secutiry-option/src/error/madaca_exception.py +++ b/lambda/check-view-secutiry-option/check-view-option/exceptions.py @@ -5,3 +5,7 @@ class MeDaCaException(Exception, metaclass=ABCMeta): def __init__(self, error_id: str, message) -> None: super().__init__(message) self.error_id = error_id + + +class FileNotFoundException(MeDaCaException): + pass diff --git a/lambda/check-view-secutiry-option/main.py b/lambda/check-view-secutiry-option/check-view-option/main.py similarity index 57% rename from lambda/check-view-secutiry-option/main.py rename to lambda/check-view-secutiry-option/check-view-option/main.py index 0ac8513b..fa6e8156 100644 --- a/lambda/check-view-secutiry-option/main.py +++ b/lambda/check-view-secutiry-option/check-view-option/main.py @@ -2,9 +2,8 @@ Viewセキュリティオプション付与チェック用Lambda関数のエントリーポイント """ -from src.error.file_not_found_exception import FileNotFoundException -from src.error.madaca_exception import MeDaCaException -from src.logger.logger import MeDaCaLogger +from exceptions import FileNotFoundException, MeDaCaException +from medaca_logger import MeDaCaLogger def handler(event, context): @@ -12,8 +11,9 @@ def handler(event, context): try: logger.info('lambda handle') raise FileNotFoundException('E-02-01', 'ファイル見つかりません') - except MeDaCaException as e: - logger.exception(f'exception: {e.error_id} {e}') + except Exception as e: + logger.exception(f'exception: {e}') + # logger.exception(f'exception: {e.error_id} {e}') # ローカル実行用 diff --git a/lambda/check-view-secutiry-option/src/logger/logger.py b/lambda/check-view-secutiry-option/check-view-option/medaca_logger.py similarity index 75% rename from lambda/check-view-secutiry-option/src/logger/logger.py rename to lambda/check-view-secutiry-option/check-view-option/medaca_logger.py index 4e71d919..701ecb5e 100644 --- a/lambda/check-view-secutiry-option/src/logger/logger.py +++ b/lambda/check-view-secutiry-option/check-view-option/medaca_logger.py @@ -2,9 +2,8 @@ import datetime import logging from zoneinfo import ZoneInfo -from ..system_vars.constants import (DEFAULT_TIMEZONE, LOG_DATE_FORMAT, - LOG_FORMAT) -from ..system_vars.environments import LOG_LEVEL +from constants import DEFAULT_TIMEZONE, LOG_DATE_FORMAT, LOG_FORMAT +from environments import LOG_LEVEL class SingletonLogger: @@ -12,16 +11,17 @@ class SingletonLogger: @staticmethod def __internal_new__() -> logging.Logger: # logger設定 + logger = logging.getLogger() formatter = logging.Formatter( LOG_FORMAT, LOG_DATE_FORMAT ) formatter.converter = lambda: datetime.datetime.now(ZoneInfo(DEFAULT_TIMEZONE)).timetuple() + for handler in logger.handlers: + handler.setFormatter(formatter) level = logging.getLevelName(LOG_LEVEL) - - logging.basicConfig(level=level, format=LOG_FORMAT, datefmt=LOG_DATE_FORMAT) - # logger.setLevel(level) - logger = logging.getLogger() + print(level) + logger.setLevel(level) return logger diff --git a/lambda/check-view-secutiry-option/src/error/file_not_found_exception.py b/lambda/check-view-secutiry-option/src/error/file_not_found_exception.py deleted file mode 100644 index f3ea4438..00000000 --- a/lambda/check-view-secutiry-option/src/error/file_not_found_exception.py +++ /dev/null @@ -1,5 +0,0 @@ -from .madaca_exception import MeDaCaException - - -class FileNotFoundException(MeDaCaException): - pass