Merge pull request #3887 from cloudnativedaysjp/prod_bugfix

fix roleName & specify region as variable
cloudnativedaysjp · Oct 26, 2024 · 1621387 · 1621387
2 parents f0acc76 + 8f5ce51
commit 1621387
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 34 deletions.
diff --git a/ecspresso/prod/harvestjob/task-def.jsonnet b/ecspresso/prod/harvestjob/task-def.jsonnet
@@ -1,15 +1,15 @@
 local const = import '../const.libsonnet';
 local family = 'dreamkast-prod-post-registration';
 local executionRoleName = 'dreamkast-prod-ecs-task-execution-role';
-local roleName = 'dreamkast-prod-ecs-applications-without-using-aws-services';
+local roleName = 'dreamkast-prod-ecs-harvestjob';
 
 {
   containerDefinitions: [
     {
       local container = self,
 
       name: 'dreamkast',
-      image: '607167088920.dkr.ecr.ap-northeast-1.amazonaws.com/dreamkast-ecs:%s' % [const.imageTags.dreamkast_ecs],
+      image: '607167088920.dkr.ecr.%s.amazonaws.com/dreamkast-ecs:%s' % [const.region, const.imageTags.dreamkast_ecs],
       essential: true,
       entryPoint: [
         '/bin/bash',
@@ -55,31 +55,31 @@ local roleName = 'dreamkast-prod-ecs-applications-without-using-aws-services';
       secrets: [
         {
           name: 'RAILS_MASTER_KEY',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s' % [const.secretManager.railsApp],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s' % [const.region, const.secretManager.railsApp],
         },
         {
           name: 'AUTH0_CLIENT_ID',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:AUTH0_CLIENT_ID::' % [const.secretManager.dk],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:AUTH0_CLIENT_ID::' % [const.region, const.secretManager.dk],
         },
         {
           name: 'AUTH0_CLIENT_SECRET',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:AUTH0_CLIENT_SECRET::' % [const.secretManager.dk],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:AUTH0_CLIENT_SECRET::' % [const.region, const.secretManager.dk],
         },
         {
           name: 'AUTH0_DOMAIN',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:AUTH0_DOMAIN::' % [const.secretManager.dk],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:AUTH0_DOMAIN::' % [const.region, const.secretManager.dk],
         },
         {
           name: 'SLACK_TOKEN',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:SLACK_TOKEN::' % [const.secretManager.dk],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:SLACK_TOKEN::' % [const.region, const.secretManager.dk],
         },
         {
           name: 'MYSQL_USER',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:username::' % [const.secretManager.rds],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:username::' % [const.region, const.secretManager.rds],
         },
         {
           name: 'MYSQL_PASSWORD',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:password::' % [const.secretManager.rds],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:password::' % [const.region, const.secretManager.rds],
         },
       ],
 
@@ -88,7 +88,7 @@ local roleName = 'dreamkast-prod-ecs-applications-without-using-aws-services';
         options: {
           'awslogs-create-group': 'true',
           'awslogs-group': family,
-          'awslogs-region': 'ap-northeast-1',
+          'awslogs-region': const.region,
           'awslogs-stream-prefix': container.name,
         },
       },

diff --git a/ecspresso/prod/medialive-alert/task-def.jsonnet b/ecspresso/prod/medialive-alert/task-def.jsonnet
@@ -1,15 +1,15 @@
 local const = import '../const.libsonnet';
 local family = 'dreamkast-prod-medialive-alert';
 local executionRoleName = 'dreamkast-prod-ecs-task-execution-role';
-local roleName = 'dreamkast-prod-ecs-applications-without-using-aws-services';
+local roleName = 'dreamkast-prod-ecs-medialive-alert';
 
 {
   containerDefinitions: [
     {
       local container = self,
 
       name: 'dreamkast',
-      image: '607167088920.dkr.ecr.ap-northeast-1.amazonaws.com/dreamkast-ecs:%s' % [const.imageTags.dreamkast_ecs],
+      image: '607167088920.dkr.ecr.%s.amazonaws.com/dreamkast-ecs:%s' % [const.region, const.imageTags.dreamkast_ecs],
       essential: true,
       entryPoint: [
         '/bin/bash',
@@ -55,31 +55,31 @@ local roleName = 'dreamkast-prod-ecs-applications-without-using-aws-services';
       secrets: [
         {
           name: 'RAILS_MASTER_KEY',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s' % [const.secretManager.railsApp],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s' % [const.region, const.secretManager.railsApp],
         },
         {
           name: 'AUTH0_CLIENT_ID',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:AUTH0_CLIENT_ID::' % [const.secretManager.dk],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:AUTH0_CLIENT_ID::' % [const.region, const.secretManager.dk],
         },
         {
           name: 'AUTH0_CLIENT_SECRET',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:AUTH0_CLIENT_SECRET::' % [const.secretManager.dk],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:AUTH0_CLIENT_SECRET::' % [const.region, const.secretManager.dk],
         },
         {
           name: 'AUTH0_DOMAIN',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:AUTH0_DOMAIN::' % [const.secretManager.dk],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:AUTH0_DOMAIN::' % [const.region, const.secretManager.dk],
         },
         {
           name: 'SLACK_TOKEN',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:SLACK_TOKEN::' % [const.secretManager.dk],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:SLACK_TOKEN::' % [const.region, const.secretManager.dk],
         },
         {
           name: 'MYSQL_USER',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:username::' % [const.secretManager.rds],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:username::' % [const.region, const.secretManager.rds],
         },
         {
           name: 'MYSQL_PASSWORD',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:password::' % [const.secretManager.rds],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:password::' % [const.region, const.secretManager.rds],
         },
       ],
 
@@ -88,7 +88,7 @@ local roleName = 'dreamkast-prod-ecs-applications-without-using-aws-services';
         options: {
           'awslogs-create-group': 'true',
           'awslogs-group': family,
-          'awslogs-region': 'ap-northeast-1',
+          'awslogs-region': const.region,
           'awslogs-stream-prefix': container.name,
         },
       },

diff --git a/ecspresso/prod/post-registration/task-def.jsonnet b/ecspresso/prod/post-registration/task-def.jsonnet
@@ -9,7 +9,7 @@ local roleName = 'dreamkast-prod-ecs-post-registration';
       local container = self,
 
       name: 'dreamkast',
-      image: '607167088920.dkr.ecr.ap-northeast-1.amazonaws.com/dreamkast-ecs:%s' % [const.imageTags.dreamkast_ecs],
+      image: '607167088920.dkr.ecr.%s.amazonaws.com/dreamkast-ecs:%s' % [const.region, const.imageTags.dreamkast_ecs],
       essential: true,
       entryPoint: [
         '/bin/bash',
@@ -55,31 +55,31 @@ local roleName = 'dreamkast-prod-ecs-post-registration';
       secrets: [
         {
           name: 'RAILS_MASTER_KEY',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s' % [const.secretManager.railsApp],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s' % [const.region, const.secretManager.railsApp],
         },
         {
           name: 'AUTH0_CLIENT_ID',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:AUTH0_CLIENT_ID::' % [const.secretManager.dk],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:AUTH0_CLIENT_ID::' % [const.region, const.secretManager.dk],
         },
         {
           name: 'AUTH0_CLIENT_SECRET',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:AUTH0_CLIENT_SECRET::' % [const.secretManager.dk],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:AUTH0_CLIENT_SECRET::' % [const.region, const.secretManager.dk],
         },
         {
           name: 'AUTH0_DOMAIN',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:AUTH0_DOMAIN::' % [const.secretManager.dk],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:AUTH0_DOMAIN::' % [const.region, const.secretManager.dk],
         },
         {
           name: 'SLACK_TOKEN',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:SLACK_TOKEN::' % [const.secretManager.dk],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:SLACK_TOKEN::' % [const.region, const.secretManager.dk],
         },
         {
           name: 'MYSQL_USER',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:username::' % [const.secretManager.rds],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:username::' % [const.region, const.secretManager.rds],
         },
         {
           name: 'MYSQL_PASSWORD',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:password::' % [const.secretManager.rds],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:password::' % [const.region, const.secretManager.rds],
         },
       ],
 
@@ -88,7 +88,7 @@ local roleName = 'dreamkast-prod-ecs-post-registration';
         options: {
           'awslogs-create-group': 'true',
           'awslogs-group': family,
-          'awslogs-region': 'ap-northeast-1',
+          'awslogs-region': const.region,
           'awslogs-stream-prefix': container.name,
         },
       },

diff --git a/ecspresso/prod/seaman/task-def.jsonnet b/ecspresso/prod/seaman/task-def.jsonnet
@@ -46,19 +46,19 @@ local roleName = 'dreamkast-prod-ecs-seaman';
       secrets: [
         {
           name: 'GITHUB_TOKEN',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:GITHUB_TOKEN::' % [const.secretManager.releasebot],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:GITHUB_TOKEN::' % [const.region, const.secretManager.releasebot],
         },
         {
           name: 'GITHUB_WEBHOOK_SECRET',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:GITHUB_WEBHOOK_SECRET::' % [const.secretManager.releasebot],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:GITHUB_WEBHOOK_SECRET::' % [const.region, const.secretManager.releasebot],
         },
         {
           name: 'SLACK_BOT_TOKEN',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:SLACK_BOT_TOKEN::' % [const.secretManager.releasebot],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:SLACK_BOT_TOKEN::' % [const.region, const.secretManager.releasebot],
         },
         {
           name: 'SLACK_APP_TOKEN',
-          valueFrom: 'arn:aws:secretsmanager:ap-northeast-1:607167088920:secret:%s:SLACK_APP_TOKEN::' % [const.secretManager.releasebot],
+          valueFrom: 'arn:aws:secretsmanager:%s:607167088920:secret:%s:SLACK_APP_TOKEN::' % [const.region, const.secretManager.releasebot],
         },
       ],
 
@@ -67,7 +67,7 @@ local roleName = 'dreamkast-prod-ecs-seaman';
         options: {
           'awslogs-create-group': 'true',
           'awslogs-group': family,
-          'awslogs-region': 'ap-northeast-1',
+          'awslogs-region': const.region,
           'awslogs-stream-prefix': container.name,
         },
       },