Remove hard code region

mpon · mpon · commit 7d9a24ab94b3 · 2020-07-31T11:23:10.000+09:00
diff --git a/terraform/common/Makefile b/terraform/common/Makefile
@@ -1,5 +1,7 @@
 init:
-	terraform init -backend-config="bucket=${TF_VAR_remote_backend}"
+	terraform init \
+		-backend-config="bucket=${TF_VAR_remote_backend}" \
+		-backend-config="region=${AWS_DEFAULT_REGION}"
 
 fmt:
 	terraform fmt -recursive -diff ../
diff --git a/terraform/common/main.tf b/terraform/common/main.tf
@@ -1,12 +1,10 @@
 provider "aws" {
   version = "~> 2.70"
-  region  = "ap-northeast-1"
 }
 
 terraform {
   required_version = ">= 0.12"
   backend "s3" {
-    key    = "terraform/common/terraform.tfstate"
-    region = "ap-northeast-1"
+    key = "terraform/common/terraform.tfstate"
   }
 }
diff --git a/terraform/dev/Makefile b/terraform/dev/Makefile
@@ -1,5 +1,7 @@
 init:
-	terraform init -backend-config="bucket=${TF_VAR_remote_backend}"
+	terraform init \
+		-backend-config="bucket=${TF_VAR_remote_backend}" \
+		-backend-config="region=${AWS_DEFAULT_REGION}"
 
 fmt:
 	terraform fmt -recursive -diff ../
diff --git a/terraform/dev/main.tf b/terraform/dev/main.tf
@@ -1,12 +1,10 @@
 provider "aws" {
   version = "~> 2.70"
-  region  = "ap-northeast-1"
 }
 
 terraform {
   required_version = ">= 0.12"
   backend "s3" {
-    key    = "terraform/dev/terraform.tfstate"
-    region = "ap-northeast-1"
+    key = "terraform/dev/terraform.tfstate"
   }
 }
diff --git a/terraform/prod/Makefile b/terraform/prod/Makefile
@@ -1,5 +1,7 @@
 init:
-	terraform init -backend-config="bucket=${TF_VAR_remote_backend}"
+	terraform init \
+		-backend-config="bucket=${TF_VAR_remote_backend}" \
+		-backend-config="region=${AWS_DEFAULT_REGION}"
 
 fmt:
 	terraform fmt -recursive -diff ../
diff --git a/terraform/prod/main.tf b/terraform/prod/main.tf
@@ -1,6 +1,5 @@
 provider "aws" {
   version = "~> 2.70"
-  region  = "ap-northeast-1"
 }
 
 provider "github" {
@@ -19,8 +18,7 @@ provider "random" {
 terraform {
   required_version = ">= 0.12"
   backend "s3" {
-    key    = "terraform/prod/terraform.tfstate"
-    region = "ap-northeast-1"
+    key = "terraform/prod/terraform.tfstate"
   }
 }
 
@@ -30,6 +28,6 @@ data "terraform_remote_state" "common" {
   config = {
     bucket = var.remote_backend
     key    = "terraform/common/terraform.tfstate"
-    region = "ap-northeast-1"
+    region = data.aws_region.current.name
   }
 }
diff --git a/terraform/stg/Makefile b/terraform/stg/Makefile
@@ -1,5 +1,7 @@
 init:
-	terraform init -backend-config="bucket=${TF_VAR_remote_backend}"
+	terraform init \
+		-backend-config="bucket=${TF_VAR_remote_backend}" \
+		-backend-config="region=${AWS_DEFAULT_REGION}"
 
 fmt:
 	terraform fmt -recursive -diff ../
diff --git a/terraform/stg/main.tf b/terraform/stg/main.tf
@@ -1,6 +1,5 @@
 provider "aws" {
   version = "~> 2.70"
-  region  = "ap-northeast-1"
 }
 
 provider "github" {
@@ -19,8 +18,7 @@ provider "random" {
 terraform {
   required_version = ">= 0.12"
   backend "s3" {
-    key    = "terraform/stg/terraform.tfstate"
-    region = "ap-northeast-1"
+    key = "terraform/stg/terraform.tfstate"
   }
 }
 
@@ -30,6 +28,6 @@ data "terraform_remote_state" "common" {
   config = {
     bucket = var.remote_backend
     key    = "terraform/common/terraform.tfstate"
-    region = "ap-northeast-1"
+    region = data.aws_region.current.name
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,10 @@`
`1`	`1`	`provider "aws" {`
`2`	`2`	`version = "~> 2.70"`
`3`		`- region = "ap-northeast-1"`
`4`	`3`	`}`
`5`	`4`
`6`	`5`	`terraform {`
`7`	`6`	`required_version = ">= 0.12"`
`8`	`7`	`backend "s3" {`
`9`		`- key = "terraform/common/terraform.tfstate"`
`10`		`- region = "ap-northeast-1"`
	`8`	`+ key = "terraform/common/terraform.tfstate"`
`11`	`9`	`}`
`12`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`provider "aws" {`
`2`	`2`	`version = "~> 2.70"`
`3`		`- region = "ap-northeast-1"`
`4`	`3`	`}`
`5`	`4`
`6`	`5`	`provider "github" {`
`@@ -19,8 +18,7 @@ provider "random" {`
`19`	`18`	`terraform {`
`20`	`19`	`required_version = ">= 0.12"`
`21`	`20`	`backend "s3" {`
`22`		`- key = "terraform/prod/terraform.tfstate"`
`23`		`- region = "ap-northeast-1"`
	`21`	`+ key = "terraform/prod/terraform.tfstate"`
`24`	`22`	`}`
`25`	`23`	`}`
`26`	`24`
`@@ -30,6 +28,6 @@ data "terraform_remote_state" "common" {`
`30`	`28`	`config = {`
`31`	`29`	`bucket = var.remote_backend`
`32`	`30`	`key = "terraform/common/terraform.tfstate"`
`33`		`- region = "ap-northeast-1"`
	`31`	`+ region = data.aws_region.current.name`
`34`	`32`	`}`
`35`	`33`	`}`