Remove hard code region

Author: mpon

terraform/prod/access_logs_bucket.tf

@@ -3,7 +3,7 @@ resource "random_pet" "access_logs" {
 }
 
 resource "aws_s3_bucket" "access_logs" {
-  bucket        = "access-logs-${random_pet.access_logs.id}"
+  bucket        = "${local.env}-access-logs-${random_pet.access_logs.id}"
   acl           = "private"
   force_destroy = true # to make it easier to destroy at this repository example
 }
@@ -13,15 +13,18 @@ resource "aws_s3_bucket_policy" "access_logs" {
   policy = data.aws_iam_policy_document.access_logs.json
 }
 
+data "aws_elb_service_account" "main" {}
+
 data "aws_iam_policy_document" "access_logs" {
-  # Allow from Elastic Load Balancing account in ap-northeast-1
+  # Allow from Elastic Load Balancing account
+  # ref: https://docs.aws.amazon.com/ja_jp/elasticloadbalancing/latest/application/load-balancer-access-logs.html
   statement {
     actions   = ["s3:PutObject"]
     resources = ["${aws_s3_bucket.access_logs.arn}/*"]
 
     principals {
       type        = "AWS"
-      identifiers = ["arn:aws:iam::582318560864:root"]
+      identifiers = [data.aws_elb_service_account.main.arn]
     }
   }
-}
+}

terraform/prod/codepipeline.tf

@@ -38,7 +38,7 @@ resource "aws_codepipeline" "codepipeline" {
       configuration = {
         Owner                = dirname(data.github_repository.repo.full_name)
         Repo                 = data.github_repository.repo.name
-        Branch               = "master"
+        Branch               = var.target_branch
         PollForSourceChanges = false
       }
     }

terraform/prod/ecs_scheduled_task_export.tf

@@ -16,6 +16,7 @@ resource "aws_ecs_task_definition" "export" {
     image               = data.terraform_remote_state.common.outputs.ecr_rails_blog_example_repository_url
     awslogs_group       = aws_cloudwatch_log_group.export.name
     awslogs_region      = data.aws_region.current.name
+    aws_region          = data.aws_region.current.name
     database_url_arn    = aws_ssm_parameter.database_url.arn
     secret_key_base_arn = aws_ssm_parameter.secret_key_base.arn
   })

terraform/prod/ecs_service_api.tf

@@ -23,6 +23,7 @@ resource "aws_s3_bucket_object" "api_task_definition" {
     execution_role_arn        = module.ecs_task_execution_iam.service_role_arn
     awslogs_group             = aws_cloudwatch_log_group.api.name
     awslogs_region            = data.aws_region.current.name
+    aws_region                = data.aws_region.current.name
     memory                    = 512
     task_role_arn             = module.ecs_task_execution_iam.service_role_arn
     family                    = aws_ecs_task_definition.api.family

terraform/prod/ecs_service_web.tf

@@ -23,6 +23,7 @@ resource "aws_s3_bucket_object" "web_task_definition" {
     execution_role_arn        = module.ecs_task_execution_iam.service_role_arn
     awslogs_group             = aws_cloudwatch_log_group.web.name
     awslogs_region            = data.aws_region.current.name
+    aws_region                = data.aws_region.current.name
     memory                    = 512
     task_role_arn             = module.ecs_task_execution_iam.service_role_arn
     family                    = aws_ecs_task_definition.web.family

terraform/prod/templates/api/taskdef.json

@@ -18,7 +18,7 @@
         "environment": [
           {
             "name": "AWS_REGION",
-            "value": "ap-northeast-1"
+            "value": "${aws_region}"
           },
           {
             "name": "RAILS_LOG_TO_STDOUT",

terraform/prod/templates/export/container_definitions.json

@@ -11,7 +11,7 @@
     "environment": [
       {
         "name": "AWS_REGION",
-        "value": "ap-northeast-1"
+        "value": "${aws_region}"
       },
       {
         "name": "RAILS_LOG_TO_STDOUT",

terraform/prod/templates/web/taskdef.json

@@ -20,7 +20,7 @@
       "environment": [
         {
           "name": "AWS_REGION",
-          "value": "ap-northeast-1"
+          "value": "${aws_region}"
         },
         {
           "name": "RAILS_LOG_TO_STDOUT",

terraform/stg/access_logs_bucket.tf

@@ -13,15 +13,18 @@ resource "aws_s3_bucket_policy" "access_logs" {
   policy = data.aws_iam_policy_document.access_logs.json
 }
 
+data "aws_elb_service_account" "main" {}
+
 data "aws_iam_policy_document" "access_logs" {
-  # Allow from Elastic Load Balancing account in ap-northeast-1
+  # Allow from Elastic Load Balancing account
+  # ref: https://docs.aws.amazon.com/ja_jp/elasticloadbalancing/latest/application/load-balancer-access-logs.html
   statement {
     actions   = ["s3:PutObject"]
     resources = ["${aws_s3_bucket.access_logs.arn}/*"]
 
     principals {
       type        = "AWS"
-      identifiers = ["arn:aws:iam::582318560864:root"]
+      identifiers = [data.aws_elb_service_account.main.arn]
     }
   }
-}
+}

terraform/stg/ecs_scheduled_task_export.tf

@@ -16,6 +16,7 @@ resource "aws_ecs_task_definition" "export" {
     image               = data.terraform_remote_state.common.outputs.ecr_rails_blog_example_repository_url
     awslogs_group       = aws_cloudwatch_log_group.export.name
     awslogs_region      = data.aws_region.current.name
+    aws_region          = data.aws_region.current.name
     database_url_arn    = aws_ssm_parameter.database_url.arn
     secret_key_base_arn = aws_ssm_parameter.secret_key_base.arn
   })