From 6f814e83a49f43d232020c22ee324012ef11d22d Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 11 Mar 2024 14:58:34 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20S11=20#13,=20#14=20=E6=9C=AA?= =?UTF-8?q?=E5=8F=97=E9=A0=98=E9=80=9A=E7=9F=A5=E5=B9=B4=E6=9C=88=E3=83=81?= =?UTF-8?q?=E3=82=A7=E3=83=83=E3=82=AF=E5=87=A6=E7=90=86=E3=81=AE=E4=B8=8D?= =?UTF-8?q?=E5=82=99=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../encise-data-unreceive-check.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lambda/encise-data-unreceive-check/encise-data-unreceive-check.py b/lambda/encise-data-unreceive-check/encise-data-unreceive-check.py index d762c275..389c82f9 100644 --- a/lambda/encise-data-unreceive-check/encise-data-unreceive-check.py +++ b/lambda/encise-data-unreceive-check/encise-data-unreceive-check.py @@ -223,8 +223,9 @@ def encise_data_unreceive_check(records: list, execute_month: str) -> tuple[list is_file_not_exists = False # 存在したファイルの年月部分を抜き出し、チェック対象年月（処理稼働月-1)である場合 match_group_yyyymm = match_result.group(1) - check_target_yyyymm = (datetime.datetime.now( - ZoneInfo(TZ)) - relativedelta(month=1)).strftime('%Y%m') + today = datetime.datetime.now(ZoneInfo(TZ)) + minus_1_month = today + relativedelta(months=-1) + check_target_yyyymm = minus_1_month.strftime('%Y%m') if match_group_yyyymm == check_target_yyyymm: logger.info( f'I-04-04 I/Fファイルの受領を確認しました　ファイル名：{file_name}') From 6fd5ada477fdb323dd1d6db72932fa2048a88e00 Mon Sep 17 00:00:00 2001 From: "nik.n" Date: Tue, 19 Mar 2024 11:50:55 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E9=80=81=E4=BF=A1=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=82=92CSV=E3=81=AB=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E3=83=AD=E3=82=B8=E3=83=83=E3=82=AF=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lambda/transfer-encise-data/transfer-encise-data.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lambda/transfer-encise-data/transfer-encise-data.py b/lambda/transfer-encise-data/transfer-encise-data.py index bc58963c..5e09b7d3 100644 --- a/lambda/transfer-encise-data/transfer-encise-data.py +++ b/lambda/transfer-encise-data/transfer-encise-data.py @@ -83,7 +83,9 @@ def lambda_handler(event, context): s3_client.copy_object( Bucket=DATA_IMPORT_BUCKET, Key=f'{ENCISE_TARGET_FOLDER}/{event_file_name}', - CopySource=copy_source + CopySource=copy_source, + ContentType='text/csv', # ファイルのタイプを指定する必要があるため、ContentTypeを指定する。 + MetadataDirective='REPLACE' # ファイルのメタデータを置き換える必要があるため、MetadataDirectiveを指定する。 ) # コピー後、元のバケットからは削除する s3_client.delete_object(Bucket=event_bucket_name, Key=event_object_key) From f97f80f84eaa389f3bda8f3a5692323d3f3d744d Mon Sep 17 00:00:00 2001 From: "nik.n" Date: Tue, 19 Mar 2024 17:07:50 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E3=83=90=E3=83=83=E3=82=AF=E3=82=A2?= =?UTF-8?q?=E3=83=83=E3=83=97=E7=94=A8=E3=81=AEContentType=E6=8C=87?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lambda/transfer-encise-data/transfer-encise-data.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lambda/transfer-encise-data/transfer-encise-data.py b/lambda/transfer-encise-data/transfer-encise-data.py index 5e09b7d3..0f90483c 100644 --- a/lambda/transfer-encise-data/transfer-encise-data.py +++ b/lambda/transfer-encise-data/transfer-encise-data.py @@ -75,7 +75,9 @@ def lambda_handler(event, context): s3_client.copy_object( Bucket=ENCISE_BACKUP_BUCKET, Key=f'{event_folder_name}/{execute_date_yyyymm}/{event_file_name}', - CopySource=copy_source + CopySource=copy_source, + ContentType='text/csv', # ファイルのタイプを指定する必要があるため、ContentTypeを指定する。 + MetadataDirective='REPLACE' # ファイルのメタデータを置き換える必要があるため、MetadataDirectiveを指定する。 ) logger.info(f'I-04-01 Encise受信データのバックアップ完了：{ENCISE_BACKUP_BUCKET}/{event_folder_name}/{execute_date_yyyymm}/{event_file_name}') From b853c71b35bb7dbcf3a1e980de4ecb9c641481c0 Mon Sep 17 00:00:00 2001 From: "nik.n" Date: Thu, 28 Mar 2024 10:39:43 +0900 Subject: [PATCH 4/4] =?UTF-8?q?DB=E3=83=80=E3=83=B3=E3=83=97SG=E5=80=A4?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stepfunctions/TOOLS/convert_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stepfunctions/TOOLS/convert_config.yaml b/stepfunctions/TOOLS/convert_config.yaml index c0f62a09..a6bf5c42 100644 --- a/stepfunctions/TOOLS/convert_config.yaml +++ b/stepfunctions/TOOLS/convert_config.yaml @@ -45,7 +45,7 @@ resource: # セキュリティグループ(ecs-jskult-batch-laundering) - &PRD_SG_JSKULT_BATCH_LAUNDERING "sg-0d2bc30c1a2939c32" # セキュリティグループ(ecs-export-dbdump) - - &PRD_SG_EXPORT_DBDUMP "sg-xxxxxxxxxxxxxxxx" + - &PRD_SG_EXPORT_DBDUMP "sg-07ce73feffb53fadc" config: # CRMデータ取得 r-crm-datafetch-state: