From deac56ef5096064b1bd85b8c143dff7a6efa64ac Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Wed, 16 Nov 2022 11:06:23 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20Sfn=E3=81=AB=E6=B8=A1=E3=81=99=E3=83=91?=
 =?UTF-8?q?=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E3=82=92=E6=9C=80=E9=81=A9?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lambda/dataimport/dataimport.py | 78 ++++++---------------------------
 1 file changed, 14 insertions(+), 64 deletions(-)

diff --git a/lambda/dataimport/dataimport.py b/lambda/dataimport/dataimport.py
index bb2df665..0daf4194 100644
--- a/lambda/dataimport/dataimport.py
+++ b/lambda/dataimport/dataimport.py
@@ -16,7 +16,6 @@ SECURITY_GROUP_ID_ECSDATAIMPORT = os.environ["SECURITY_GROUP_ID_ECSDATAIMPORT"]
 MODE = os.environ["MODE"]
 
 # クラス変数
-ecs_client = boto3.client('ecs')
 sfn_client = boto3.client('stepfunctions')
 
 
@@ -38,73 +37,24 @@ def lambda_handler(event, context):
         stateMachineArn=SFN_STATE_MACHINE_ARN,
         input=json.dumps(
             {
-                'inputParams': {
-                    'ecs': {
-                        'Cluster': CLUSTER_NAME,
-                        'TaskDefinition': TASK_NAME,
-                        'network': {
-                            # TODO: 配列もパラメータから組めるなら、StepFunctions側で組み立てる
-                            "Subnets": [
-                                SUBNET_ID_AP_NORTHEAST_1A,
-                                SUBNET_ID_AP_NORTHEAST_1D,
-                            ],
-                            "SecurityGroups": [
-                                SECURITY_GROUP_ID_ECSALL,
-                                SECURITY_GROUP_ID_ECSDATAIMPORT,
-                            ],
-                            
-                        },
-                        'overrides': {
-                            "ContainerName": CONTAINER_NAME,
-                            "Environment": [
-                                # TODO: 環境変数以外でも使いたいので、外出しする
-                                {"Name": 'BUCKET_NAME', "Value": event_bucket_name},
-                                {"Name": 'TARGET_KEY', "Value": event_object_key},
-                                {"Name": 'DATA_SOURCE_NAME', "Value": event_data_source_name},
-                                {"Name": 'FILE_NAME', "Value": event_file_name},
-                                {"Name": 'MODE', "Value": MODE},
-                            ],
-                        },
-                    },
+                'InputParams': {
+                    'ClusterName': CLUSTER_NAME,
+                    'TaskName': TASK_NAME,
+                    'SubNetIdApNorthEast1A': SUBNET_ID_AP_NORTHEAST_1A,
+                    'SubNetIdApNorthEast1D': SUBNET_ID_AP_NORTHEAST_1D,
+                    'SecurityGroupIdECSAll': SECURITY_GROUP_ID_ECSALL,
+                    'SecurityGroupIdECSDataImport': SECURITY_GROUP_ID_ECSDATAIMPORT,
+                    'ContainerName': CONTAINER_NAME,
+                    'BucketName': event_bucket_name,
+                    'TargetKey': event_object_key,
+                    'DataSourceName': event_data_source_name,
+                    'FileName': event_file_name,
+                    'Mode': MODE
                 }
             }
         )
     )
-    # # ECSを起動する
-    # response = ecs_client.run_task(
-    #     launchType='FARGATE',
-    #     cluster=CLUSTER_NAME,
-    #     taskDefinition=TASK_NAME,
-    #     networkConfiguration={
-    #         "awsvpcConfiguration": {
-    #             "subnets": [
-    #                 SUBNET_ID_AP_NORTHEAST_1A,
-    #                 SUBNET_ID_AP_NORTHEAST_1D,
-    #             ],
-    #             "securityGroups": [
-    #                 SECURITY_GROUP_ID_ECSALL,
-    #                 SECURITY_GROUP_ID_ECSDATAIMPORT,
-    #             ],
-    #         }
-    #     },
-    #     overrides={
-    #         "containerOverrides": [
-    #             {
-    #                 "name": CONTAINER_NAME,
-    #                 "environment": [
-    #                     {"name": 'BUCKET_NAME', "value": event_bucket_name},
-    #                     {"name": 'TARGET_KEY', "value": event_object_key},
-    #                     {"name": 'DATA_SOURCE_NAME', "value": event_data_source_name},
-    #                     {"name": 'FILE_NAME', "value": event_file_name},
-    #                     {"name": 'MODE', "value": MODE},
-    #                 ],
-    #             },
-    #         ],
-    #     },
-    # )
-    
-    # TODO: コメントと設計修正
-    print(f'{datetime.now():%Y-%m-%d %H:%M:%S} Info I-5 ECS起動レスポンス：{str(response)}')
+    print(f'{datetime.now():%Y-%m-%d %H:%M:%S} Info I-5 StepFunctions起動レスポンス：{str(response)}')
 
     print(f'{datetime.now():%Y-%m-%d %H:%M:%S} Info I-6 駆動処理終了')