From efdc0a0a2398f1c616a120d8a38f377242a00576 Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Fri, 21 Apr 2023 17:42:43 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=9F=E7=B8=BE=E5=85=A8=E4=BB=B6?=
 =?UTF-8?q?=E6=B4=97=E6=9B=BF=E3=83=90=E3=83=83=E3=83=81=E3=81=AE=E3=82=B9?=
 =?UTF-8?q?=E3=83=86=E3=83=BC=E3=83=88=E3=83=9E=E3=82=B7=E3=83=B3=E4=BD=9C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stepfunctions/TOOLS/convert_config.yaml       | 34 ++++++++-
 .../r-jskult-batch-laundering-state.json      | 72 +++++++++++++++++++
 .../r-jskult-dbdump-state.json                |  4 +-
 3 files changed, 106 insertions(+), 4 deletions(-)
 create mode 100644 stepfunctions/r-jskult-batch-laundering-state/r-jskult-batch-laundering-state.json

diff --git a/stepfunctions/TOOLS/convert_config.yaml b/stepfunctions/TOOLS/convert_config.yaml
index 172bfbbd..c68ae70a 100644
--- a/stepfunctions/TOOLS/convert_config.yaml
+++ b/stepfunctions/TOOLS/convert_config.yaml
@@ -136,7 +136,7 @@ config:
       SUBNET_PRI_1D: *STG_SUBNET_PRI_1D
       # セキュリティグループ(ecs-all)
       SG_ECS_ALL: *STG_SG_ECS_ALL
-      # セキュリティグループ(ecs-jskut-batch-daily)
+      # セキュリティグループ(ecs-jskut-batch-monthly)
       SG_JSKULT_BATCH_MONTHLY: *STG_SG_JSKULT_BATCH_MONTHLY
     # 本番環境
     product:
@@ -150,7 +150,7 @@ config:
       SUBNET_PRI_1D: *PRD_SUBNET_PRI_1D
       # セキュリティグループ(ecs-all)
       SG_ECS_ALL: *PRD_SG_ECS_ALL
-      # セキュリティグループ(ecs-jskut-batch-daily)
+      # セキュリティグループ(ecs-jskut-batch-monthly)
       SG_JSKULT_BATCH_MONTHLY: *PRD_SG_JSKULT_BATCH_MONTHLY
   # 実消化&アルトマーク 日次dump取得
   r-jskult-dbdump-state:
@@ -182,3 +182,33 @@ config:
       SG_ECS_ALL: *PRD_SG_ECS_ALL
       # セキュリティグループ(ecs-jskut-dbdump)
       SG_JSKULT_DBDUMP: *PRD_SG_JSKULT_DBDUMP
+  # 実消化&アルトマーク 実績洗替バッチ
+  r-jskult-batch-laundering-state:
+    # ステージング環境
+    staging:
+      # AWSアカウントID
+      AWS_ACCOUNT_ID: *AWS_ACCOUNT_ID
+      # 東京リージョン
+      REGION_AP_NORTHEAST_1: *REGION_AP_NORTHEAST_1
+      # サブネット(PrivateSubnet1)
+      SUBNET_PRI_1A: *STG_SUBNET_PRI_1A
+      # サブネット(PrivateSubnet2)
+      SUBNET_PRI_1D: *STG_SUBNET_PRI_1D
+      # セキュリティグループ(ecs-all)
+      SG_ECS_ALL: *STG_SG_ECS_ALL
+      # セキュリティグループ(ecs-jskut-batch-laundering)
+      SG_JSKULT_BATCH_LAUNDERING: *STG_SG_JSKULT_BATCH_LAUNDERING
+    # 本番環境
+    product:
+      # AWSアカウントID
+      AWS_ACCOUNT_ID: *AWS_ACCOUNT_ID
+      # 東京リージョン
+      REGION_AP_NORTHEAST_1: *REGION_AP_NORTHEAST_1
+      # サブネット(PrivateSubnet1)
+      SUBNET_PRI_1A: *PRD_SUBNET_PRI_1A
+      # サブネット(PrivateSubnet2)
+      SUBNET_PRI_1D: *PRD_SUBNET_PRI_1D
+      # セキュリティグループ(ecs-all)
+      SG_ECS_ALL: *PRD_SG_ECS_ALL
+      # セキュリティグループ(ecs-jskut-batch-laundering)
+      SG_JSKULT_BATCH_LAUNDERING: *STG_SG_JSKULT_BATCH_LAUNDERING
diff --git a/stepfunctions/r-jskult-batch-laundering-state/r-jskult-batch-laundering-state.json b/stepfunctions/r-jskult-batch-laundering-state/r-jskult-batch-laundering-state.json
new file mode 100644
index 00000000..c720e349
--- /dev/null
+++ b/stepfunctions/r-jskult-batch-laundering-state/r-jskult-batch-laundering-state.json
@@ -0,0 +1,72 @@
+{
+  "Comment": "MeDaCA 実消化&アルトマーク 実績全件洗替バッチ起動ステートマシン",
+  "StartAt": "params",
+  "States": {
+    "params": {
+      "Comment": "パラメータ設定",
+      "Type": "Pass",
+      "Parameters": {
+        "sns": {
+          "TopicArn": "arn:aws:sns:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:nds-notice-#{ENV_NAME}"
+        },
+        "ecs": {
+          "Cluster": "arn:aws:ecs:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:cluster/mbj-newdwh2021-#{ENV_NAME}-jskult-batch-laundering-ecs",
+          "LaunchType": "FARGATE",
+          "NetworkConfiguration": {
+            "AwsvpcConfiguration": {
+              "Subnets": [
+                "#{SUBNET_PRI_1A}",
+                "#{SUBNET_PRI_1D}"
+              ],
+              "SecurityGroups": [
+                "#{SG_ECS_ALL}",
+                "#{SG_JSKULT_BATCH_LAUNDERING}"
+              ],
+              "AssignPublicIp": "DISABLED"
+            }
+          }
+        }
+      },
+      "ResultPath": "$.params",
+      "Next": "exec-batch-laundering"
+    },
+    "exec-batch-laundering": {
+      "Comment": "実消化&アルトマーク 実績全件洗替バッチ起動",
+      "Type": "Task",
+      "Resource": "arn:aws:states:::ecs:runTask.sync",
+      "Parameters": {
+        "Cluster.$": "$.params.ecs.Cluster",
+        "LaunchType.$": "$.params.ecs.LaunchType",
+        "TaskDefinition": "arn:aws:ecs:#{REGION_AP_NORTHEAST_1}:#{AWS_ACCOUNT_ID}:task-definition/mbj-newdwh2021-#{ENV_NAME}-task-jskult-batch-laundering",
+        "NetworkConfiguration.$": "$.params.ecs.NetworkConfiguration"
+      },
+      "Retry": [
+        {
+          "ErrorEquals": ["States.ALL"],
+          "BackoffRate": 2,
+          "IntervalSeconds": 5,
+          "MaxAttempts": 3
+        }
+      ],
+      "Catch": [
+        {
+          "ErrorEquals": ["States.ALL"],
+          "ResultPath": "$.result",
+          "Next": "ErrorEnd"
+        }
+      ],
+      "ResultPath": "$.result",
+      "Next": "NormalEnd"
+    },
+    "NormalEnd": {
+      "Comment": "正常終了",
+      "Type": "Succeed"
+    },
+    "ErrorEnd": {
+      "Comment": "異常終了",
+      "Type": "Fail",
+      "Error": "StatesError",
+      "Cause": "StepFunctions ErrorEnd"
+    }
+  }
+}
diff --git a/stepfunctions/r-jskult-dbdump-state/r-jskult-dbdump-state.json b/stepfunctions/r-jskult-dbdump-state/r-jskult-dbdump-state.json
index dbcfb4b4..47fc9208 100644
--- a/stepfunctions/r-jskult-dbdump-state/r-jskult-dbdump-state.json
+++ b/stepfunctions/r-jskult-dbdump-state/r-jskult-dbdump-state.json
@@ -28,9 +28,9 @@
         }
       },
       "ResultPath": "$.params",
-      "Next": "exec-batch-monthly"
+      "Next": "exec-dbdump"
     },
-    "exec-batch-monthly": {
+    "exec-dbdump": {
       "Comment": "実消化&アルトマーク 日次dump取得起動",
       "Type": "Task",
       "Resource": "arn:aws:states:::ecs:runTask.sync",