From 1d8cdace48898c61216a0d75a657b27238fd0ba2 Mon Sep 17 00:00:00 2001
From: *lcOeIaePm0 <x.hasako.y@nds-tyo.co.jp>
Date: Wed, 20 Oct 2021 16:13:13 +0900
Subject: [PATCH] =?UTF-8?q?feat:VPC=E3=82=A8=E3=83=B3=E3=83=89=E3=83=9D?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=88=E8=BF=BD=E5=8A=A0=E3=81=AE=E3=81=9F?=
 =?UTF-8?q?=E3=82=81=E3=80=81=E3=82=BB=E3=82=AD=E3=83=A5=E3=83=AA=E3=83=86?=
 =?UTF-8?q?=E3=82=A3=E3=82=B0=E3=83=AB=E3=83=BC=E3=83=97=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat:引数の追加のため、ECS起動パラメータに値を追加した
---
 .../mbj-newdwh2021-staging-lambda-dataimport.py  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lambda/mbj-newdwh2021-staging-lambda-dataimport.py b/lambda/mbj-newdwh2021-staging-lambda-dataimport.py
index 169b845c..d2af3b0d 100644
--- a/lambda/mbj-newdwh2021-staging-lambda-dataimport.py
+++ b/lambda/mbj-newdwh2021-staging-lambda-dataimport.py
@@ -1,6 +1,5 @@
 import os
 from datetime import datetime
-from os import path
 import boto3
 
 ecs_client = boto3.client('ecs')
@@ -10,7 +9,9 @@ TASK_NAME = os.environ['TASK_NAME']
 CONTAINER_NAME = os.environ['CONTAINER_NAME']
 SUBNET_ID_AP_NORTHEAST_1A = os.environ['SUBNET_ID_AP_NORTHEAST_1A']
 SUBNET_ID_AP_NORTHEAST_1D = os.environ['SUBNET_ID_AP_NORTHEAST_1D']
-SECURITY_GROUP_ID = os.environ['SECURITY_GROUP_ID']
+SECURITY_GROUP_ID_ECRAPI = os.environ['SECURITY_GROUP_ID_ECRAPI']
+SECURITY_GROUP_ID_ECRDKR = os.environ['SECURITY_GROUP_ID_ECRDKR']
+SECURITY_GROUP_ID_LOGS = os.environ['SECURITY_GROUP_ID_LOGS']
 
 
 def lambda_handler(event, context):
@@ -34,10 +35,13 @@ def lambda_handler(event, context):
         networkConfiguration={
             'awsvpcConfiguration': {
                 'subnets': [
-                    SUBNET_ID_AP_NORTHEAST_1A, SUBNET_ID_AP_NORTHEAST_1D,
+                    SUBNET_ID_AP_NORTHEAST_1A,
+                    SUBNET_ID_AP_NORTHEAST_1D,
                 ],
                 'securityGroups': [
-                    SECURITY_GROUP_ID,
+                    SECURITY_GROUP_ID_ECRAPI,
+                    SECURITY_GROUP_ID_ECRDKR,
+                    SECURITY_GROUP_ID_LOGS,
                 ],
                 'assignPublicIp': 'ENABLED',
             }
@@ -47,8 +51,10 @@ def lambda_handler(event, context):
                 {
                     'name': CONTAINER_NAME,
                     'environment': [
-                        {'name': 'FILE_NAME', 'value': event_file_name},
+                        {'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},
                     ],
                 },
             ],