From ebb82494369db605b0b89e8625feeaa17de5c8ca Mon Sep 17 00:00:00 2001
From: *lcOeIaePm0 <x.hasako.y@nds-tyo.co.jp>
Date: Fri, 27 May 2022 19:26:55 +0900
Subject: [PATCH] =?UTF-8?q?fix:SAP=E3=83=87=E3=83=BC=E3=82=BF=E5=BE=A9?=
 =?UTF-8?q?=E5=8F=B7=E5=8C=96=E5=87=A6=E7=90=86=20=E3=83=86=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=20=E3=83=AD=E3=82=B0=E3=81=AE=E3=82=BF=E3=82=A4?=
 =?UTF-8?q?=E3=83=A0=E3=82=BE=E3=83=BC=E3=83=B3=E8=A8=AD=E5=AE=9A=E3=80=80?=
 =?UTF-8?q?=E5=BC=95=E6=95=B0=E8=A8=AD=E5=AE=9A=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datadecrypt/main.py                          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py b/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py
index 7ff4145f..617a2b9b 100644
--- a/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py
+++ b/lambda/mbj-newdwh2021-staging-lambda-sap-data-decrypt/datadecrypt/main.py
@@ -5,6 +5,7 @@ import gnupg
 import datetime
 import logging
 from abc import *
+from zoneinfo import ZoneInfo
 
 # 環境変数
 SECRET_KEY_FILE_BUCKET_NAME = os.environ["SECRET_KEY_FILE_BUCKET_NAME"]
@@ -40,10 +41,13 @@ sns_client = boto3.client('sns')
 
 # logger設定
 logger = logging.getLogger()
+def custome_time(*arg):
+    return datetime.datetime.now(ZoneInfo("Asia/Tokyo")).timetuple()
 formatter = logging.Formatter(
     '[%(levelname)s]\t%(asctime)s\t%(message)s\n',
     '%Y-%m-%d %H:%M:%S'
 )
+formatter.converter = custome_time
 for handler in logger.handlers:
     handler.setFormatter(formatter)
 
@@ -78,7 +82,7 @@ def handler(event, context):
 
         # ④ S3から秘密鍵ファイルを読み込む
         try:
-            logger.info('I-04-01 秘密鍵ファイル読込　読込元：{SECRET_KEY_FILE_BUCKET_NAME}/{SECRET_KEY_FILE_PATH}')
+            logger.info(f'I-04-01 秘密鍵ファイル読込　読込元：{SECRET_KEY_FILE_BUCKET_NAME}/{SECRET_KEY_FILE_PATH}')
             s3_client.download_file(SECRET_KEY_FILE_BUCKET_NAME, SECRET_KEY_FILE_PATH, PATH_TEMP_PRIVATE_KEY)
             logger.info('I-04-02 秘密鍵ファイルを読み込みました')
         except Exception as e:
@@ -143,16 +147,16 @@ def handler(event, context):
         # ⑧ 処理終了ログを出力する
         logger.info('I-08-01 処理終了　SAPデータ復号処理')
     except EncryptFileReadException as e:
-        create_status_file(event, e.extension)
+        create_status_file(s3_event, e.extension)
         error_notice(e.id, e.arg)
     except CustomException as e:
-        create_status_file(event, e.extension)
-        move_encrypt_file(event)
+        create_status_file(s3_event, e.extension)
+        move_encrypt_file(s3_event)
         error_notice(e.id, e.arg)
     except Exception as e:
         logger.error(f'E-99 想定外のエラーが発生しました　エラー内容：{e}')
-        create_status_file(event, EXTENSION_ERROR)
-        move_encrypt_file(event)
+        create_status_file(s3_event, EXTENSION_ERROR)
+        move_encrypt_file(s3_event)
         error_notice('E-99', e)
     return