Merge pull request #8437 from christophermichaeljohnston/master

add new ap-east-1 region
hashicorp · Apr 25, 2019 · 9a79aaa · 9a79aaa
2 parents b538d13 + 12b8a13
commit 9a79aaa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 0 deletions.
diff --git a/aws/data_source_aws_cloudtrail_service_account.go b/aws/data_source_aws_cloudtrail_service_account.go
@@ -11,6 +11,7 @@ import (
 // See https://docs.aws.amazon.com/govcloud-us/latest/ug-east/verifying-cloudtrail.html
 // See https://docs.aws.amazon.com/govcloud-us/latest/ug-west/verifying-cloudtrail.html
 var cloudTrailServiceAccountPerRegionMap = map[string]string{
+	"ap-east-1":      "119688915426",
 	"ap-northeast-1": "216624486486",
 	"ap-northeast-2": "492519147666",
 	"ap-northeast-3": "765225791966",

diff --git a/aws/data_source_aws_elb_hosted_zone_id.go b/aws/data_source_aws_elb_hosted_zone_id.go
@@ -8,6 +8,7 @@ import (
 
 // See http://docs.aws.amazon.com/general/latest/gr/rande.html#elb_region
 var elbHostedZoneIdPerRegionMap = map[string]string{
+	"ap-east-1":      "Z3DQVH9N71FHZ0",
 	"ap-northeast-1": "Z14GRHDCWA56QT",
 	"ap-northeast-2": "ZWKZPGTI48KDX",
 	"ap-northeast-3": "Z5LXEXXYW11ES",

diff --git a/aws/data_source_aws_elb_service_account.go b/aws/data_source_aws_elb_service_account.go
@@ -9,6 +9,7 @@ import (
 
 // See http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-access-logs.html#attach-bucket-policy
 var elbAccountIdPerRegionMap = map[string]string{
+	"ap-east-1":      "754344448648",
 	"ap-northeast-1": "582318560864",
 	"ap-northeast-2": "600734575887",
 	"ap-northeast-3": "383597477331",

diff --git a/aws/data_source_aws_redshift_service_account.go b/aws/data_source_aws_redshift_service_account.go
@@ -13,6 +13,7 @@ var redshiftServiceAccountPerRegionMap = map[string]string{
 	"us-east-2":      "391106570357",
 	"us-west-1":      "262260360010",
 	"us-west-2":      "902366379725",
+	"ap-east-1":      "313564881002",
 	"ap-south-1":     "865932855811",
 	"ap-northeast-2": "760740231472",
 	"ap-southeast-1": "361669875840",

diff --git a/aws/hosted_zones.go b/aws/hosted_zones.go
@@ -6,6 +6,7 @@ import "fmt"
 // http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_website_region_endpoints
 // It currently cannot be generated from the API json.
 var hostedZoneIDsMap = map[string]string{
+	"ap-east-1":      "ZNB98KWMFR0R6",
 	"ap-northeast-1": "Z2M4EHUR26P7ZW",
 	"ap-northeast-2": "Z3W03O7B5YMIYP",
 	"ap-northeast-3": "Z2YQB5RD63NC85",