From f0bcdc293b3b7e50dca598a823d5d59321a2c074 Mon Sep 17 00:00:00 2001
From: Y_SAKAI <x.sakai.y@nds-tyo.co.jp>
Date: Thu, 22 Sep 2022 16:12:10 +0900
Subject: [PATCH] =?UTF-8?q?fix:=E5=A4=89=E6=8F=9B=E5=AE=9A=E7=BE=A9?=
 =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=EF=BC=88yaml=EF=BC=89?=
 =?UTF-8?q?=E3=81=AE=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stepfunctions/TOOLS/convert_config.yaml       | 54 +++++++++++++++----
 stepfunctions/TOOLS/convert_definition.py     |  1 +
 .../r-crm-datafetch-state.json                |  8 +--
 3 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/stepfunctions/TOOLS/convert_config.yaml b/stepfunctions/TOOLS/convert_config.yaml
index 8a49600b..2b6487ea 100644
--- a/stepfunctions/TOOLS/convert_config.yaml
+++ b/stepfunctions/TOOLS/convert_config.yaml
@@ -3,30 +3,62 @@
 #   <ステートマシン名>: ステートマシン定義名
 #     <環境名>: stagingかproductのみ
 #       <ステートマシンの雛形内のプレースホルダー名>：置き換え後の値を設定する
+resource:
+  # 共通定義
+  common:
+    # AWSアカウントID
+    - &AWS_ACCOUNT_ID "826466435614"
+    # 東京リージョン
+    - &REGION_AP_NORTHEAST_1 "ap-northeast-1"
+  # ステージング環境
+  staging:
+    # サブネット(PrivateSubnet1)
+    - &STG_SUBNET_PRI_1A "subnet-0a47b12f6899ab19e"
+    # サブネット(PrivateSubnet2)
+    - &STG_SUBNET_PRI_1D "subnet-0ecb92c12eb49ebc3"
+    # セキュリティグループ(ecs-all)
+    - &STG_SG_ECS_ALL "sg-051e0fb9925539592"
+    # セキュリティグループ(ecs-crm-datafetch)
+    - &STG_SG_CRM_DATAFETCH "sg-0b20b7bb1cb1ab886"
+  # 本番環境
+  product:
+    # サブネット(PrivateSubnet1)
+    - &PRD_SUBNET_PRI_1A "subnet-0d9bf8cd421cf2489"
+    # サブネット(PrivateSubnet2)
+    - &PRD_SUBNET_PRI_1D "subnet-0595f52cf6fd9b9e7"
+    # セキュリティグループ(ecs-all)
+    - &PRD_SG_ECS_ALL "sg-05df4823fc789b0fa"
+    # セキュリティグループ(ecs-crm-datafetch)
+    # TODO: 本番環境のセキュリティグループを作成したら下記のIDを置き換える
+    - &PRD_SG_CRM_DATAFETCH "sg-XXXXXXXXXXXXXXXXX"
+
 config:
   r-crm-datafetch-state:
     # ステージング環境
     staging:
       # AWSアカウントID
-      AWS_ACCOUNT_ID: "826466435614"
+      AWS_ACCOUNT_ID: *AWS_ACCOUNT_ID
+      # 東京リージョン
+      REGION_AP_NORTHEAST_1: *REGION_AP_NORTHEAST_1
       # サブネット(PrivateSubnet1)
-      SUBNET_PRI_1A: subnet-0a47b12f6899ab19e
+      SUBNET_PRI_1A: *STG_SUBNET_PRI_1A
       # サブネット(PrivateSubnet2)
-      SUBNET_PRI_1D: subnet-0ecb92c12eb49ebc3
+      SUBNET_PRI_1D: *STG_SUBNET_PRI_1D
       # セキュリティグループ(ecs-all)
-      SG_ECS_ALL: sg-051e0fb9925539592
+      SG_ECS_ALL: *STG_SG_ECS_ALL
       # セキュリティグループ(ecs-crm-datafetch)
-      SG_CRM_DATAFETCH: sg-0b20b7bb1cb1ab886
+      SG_CRM_DATAFETCH: *STG_SG_CRM_DATAFETCH
     # 本番環境
     product:
       # AWSアカウントID
-      AWS_ACCOUNT_ID: "826466435614"
+      AWS_ACCOUNT_ID: *AWS_ACCOUNT_ID
+      # 東京リージョン
+      REGION_AP_NORTHEAST_1: *REGION_AP_NORTHEAST_1
       # サブネット(PrivateSubnet1)
-      SUBNET_PRI_1A: subnet-0d9bf8cd421cf2489
+      SUBNET_PRI_1A: *PRD_SUBNET_PRI_1A
       # サブネット(PrivateSubnet2)
-      SUBNET_PRI_1D: subnet-0595f52cf6fd9b9e7
+      SUBNET_PRI_1D: *PRD_SUBNET_PRI_1D
       # セキュリティグループ(ecs-all)
-      SG_ECS_ALL: sg-05df4823fc789b0fa
+      SG_ECS_ALL: *PRD_SG_ECS_ALL
       # セキュリティグループ(ecs-crm-datafetch)
-      # TODO: 本番環境のセキュリティグループを作成したら下記のIDを置き換える
-      SG_CRM_DATAFETCH: sg-XXXXXXXXXXXXXXXXX
+      SG_CRM_DATAFETCH: *PRD_SG_CRM_DATAFETCH
diff --git a/stepfunctions/TOOLS/convert_definition.py b/stepfunctions/TOOLS/convert_definition.py
index aead3f47..4297e703 100644
--- a/stepfunctions/TOOLS/convert_definition.py
+++ b/stepfunctions/TOOLS/convert_definition.py
@@ -103,6 +103,7 @@ def convert_definition(state_name, env_name):
 
         # 変換定義の読み込み
         convert_config = read_env_specific_config(state_name, env_name)
+        print(convert_config)
 
         # テンプレートとなるファイルを読み込み
         with open(f'{from_folder}/{state_name}.json', mode='r', encoding=CHAR_CODE) as from_file:
diff --git a/stepfunctions/r-crm-datafetch-state/r-crm-datafetch-state.json b/stepfunctions/r-crm-datafetch-state/r-crm-datafetch-state.json
index 977c1bbc..f1d3bf4f 100644
--- a/stepfunctions/r-crm-datafetch-state/r-crm-datafetch-state.json
+++ b/stepfunctions/r-crm-datafetch-state/r-crm-datafetch-state.json
@@ -7,10 +7,10 @@
       "Type": "Pass",
       "Parameters": {
         "sns": {
-          "TopicArn": "arn:aws:sns:ap-northeast-1:#{AWS_ACCOUNT_ID}:nds-notice-#{ENV_NAME}"
+          "TopicArn": "arn:aws:sns:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:nds-notice-#{ENV_NAME}"
         },
         "ecs": {
-          "Cluster": "arn:aws:ecs:ap-northeast-1:#{AWS_ACCOUNT_ID}:cluster/mbj-newdwh2021-#{ENV_NAME}-crm-ecs",
+          "Cluster": "arn:aws:ecs:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:cluster/mbj-newdwh2021-#{ENV_NAME}-crm-ecs",
           "LaunchType": "FARGATE",
           "NetworkConfiguration": {
             "AwsvpcConfiguration": {
@@ -37,7 +37,7 @@
       "Parameters": {
         "Cluster.$": "$.params.ecs.Cluster",
         "LaunchType.$": "$.params.ecs.LaunchType",
-        "TaskDefinition": "arn:aws:ecs:ap-northeast-1:#{AWS_ACCOUNT_ID}:task-definition/mbj-newdwh2021-#{ENV_NAME}-task-crm-datafetch",
+        "TaskDefinition": "arn:aws:ecs:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:task-definition/mbj-newdwh2021-#{ENV_NAME}-task-crm-datafetch",
         "NetworkConfiguration.$": "$.params.ecs.NetworkConfiguration"
       },
       "Retry": [
@@ -70,7 +70,7 @@
       "Parameters": {
         "Cluster.$": "$.params.ecs.Cluster",
         "LaunchType.$": "$.params.ecs.LaunchType",
-        "TaskDefinition": "arn:aws:ecs:ap-northeast-1:#{AWS_ACCOUNT_ID}:task-definition/mbj-newdwh2021-#{ENV_NAME}-task-crm-datafetch",
+        "TaskDefinition": "arn:aws:ecs:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:task-definition/mbj-newdwh2021-#{ENV_NAME}-task-crm-datafetch",
         "NetworkConfiguration.$": "$.params.ecs.NetworkConfiguration",
         "Overrides": {
           "ContainerOverrides": [