nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

環境変数バリデーションチェック 指摘対応対応

Browse Source
This commit is contained in:
mori.k 2025-05-30 14:10:30 +09:00
parent 40207bcad4
commit 5a2afba6cc
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ecs/jskult-batch/src/batch/environment/trn_result_data_bio_lot_environment.py
View File

@ -7,9 +7,13 @@ class TrnResultDataBioLotEnvironment(JskultBatchEnvironment):
"""実消化&アルトマークのバッチ処理で使用する環境変数を管理するクラス"""
def __init__(self):
self.JSKULT_BACKUP_BUCKET = environment.JSKULT_BACKUP_BUCKET
self.BATCH_MANAGE_DYNAMODB_TABLE_NAME = environment.BATCH_MANAGE_DYNAMODB_TABLE_NAME
self.BATCH_EXECUTION_ID = environment.BATCH_EXECUTION_ID
self.MAX_RUN_COUNT = environment.MAX_RUN_COUNT
self.PROCESS_NAME = environment.PROCESS_NAME
self.TRANSFER_RESULT_FOLDER = environment.TRANSFER_RESULT_FOLDER
self.TRANSFER_RESULT_FILE_NAME = environment.TRANSFER_RESULT_FILE_NAME
def validate(self):
"""
@ -19,10 +23,13 @@ class TrnResultDataBioLotEnvironment(JskultBatchEnvironment):
Raises:
EnvironmentVariableNotSetException: 環境変数の設定ミス
"""
super()._assert_variable_not_empty(self.JSKULT_BACKUP_BUCKET, 'JSKULT_BACKUP_BUCKET')
super()._assert_variable_not_empty(self.BATCH_MANAGE_DYNAMODB_TABLE_NAME, 'BATCH_MANAGE_DYNAMODB_TABLE_NAME')
super()._assert_variable_not_empty(self.BATCH_EXECUTION_ID, 'BATCH_EXECUTION_ID')
super()._assert_variable_is_int(self.MAX_RUN_COUNT, 'MAX_RUN_COUNT')
# MAX_RUN_COUNTは数値として扱うため、検査後に変換
self.MAX_RUN_COUNT = int(self.MAX_RUN_COUNT)
super()._assert_variable_not_empty(self.PROCESS_NAME, 'PROCESS_NAME')
super()._assert_variable_not_empty(self.TRANSFER_RESULT_FOLDER, 'TRANSFER_RESULT_FOLDER')
super()._assert_variable_not_empty(self.TRANSFER_RESULT_FILE_NAME, 'TRANSFER_RESULT_FILE_NAME')

6
ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py
View File

@ -1,7 +1,7 @@
import json
from src.aws.s3 import JskTransferListBucket
from src.batch.environment.dcf_inst_merge_environment import \
DCFInstMergeEnvironment
from src.batch.environment.trn_result_data_bio_lot_environment import \
TrnResultDataBioLotEnvironment
from src.batch.jskult_batch_entrypoint import JskultBatchEntrypoint
from src.manager.jskult_batch_run_manager import JskultBatchRunManager
from src.manager.jskult_batch_status_manager import JskultBatchStatusManager
@ -21,7 +21,7 @@ logger = get_logger('生物由来卸販売ロット分解')
class TrnResultDataBioLot(JskultBatchEntrypoint):
def __init__(self):
super().__init__()
self.environment = DCFInstMergeEnvironment
self.environment = TrnResultDataBioLotEnvironment
# 必須の環境変数が設定されていない場合、エラーにする
try: