Merge pull request #6836 from sunilkumarmohanty/eu-north-1

add support for eu-north-1 region
hashicorp · Dec 13, 2018 · 490549e · 490549e
2 parents cf2cf05 + 49f0e32
commit 490549e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 20 deletions.
diff --git a/aws/data_source_aws_cloudtrail_service_account.go b/aws/data_source_aws_cloudtrail_service_account.go
@@ -9,22 +9,24 @@ import (
 
 // See http://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-supported-regions.html
 var cloudTrailServiceAccountPerRegionMap = map[string]string{
-	"us-east-1":      "086441151436",
-	"us-east-2":      "475085895292",
-	"us-west-1":      "388731089494",
-	"us-west-2":      "113285607260",
-	"ap-south-1":     "977081816279",
+	"ap-northeast-1": "216624486486",
 	"ap-northeast-2": "492519147666",
+	"ap-northeast-3": "765225791966",
+	"ap-south-1":     "977081816279",
 	"ap-southeast-1": "903692715234",
 	"ap-southeast-2": "284668455005",
-	"ap-northeast-1": "216624486486",
 	"ca-central-1":   "819402241893",
+	"cn-northwest-1": "681348832753",
 	"eu-central-1":   "035351147821",
+	"eu-north-1":     "829690693026",
 	"eu-west-1":      "859597730677",
 	"eu-west-2":      "282025262664",
 	"eu-west-3":      "262312530599",
 	"sa-east-1":      "814480443879",
-	"cn-northwest-1": "681348832753",
+	"us-east-1":      "086441151436",
+	"us-east-2":      "475085895292",
+	"us-west-1":      "388731089494",
+	"us-west-2":      "113285607260",
 }
 
 func dataSourceAwsCloudTrailServiceAccount() *schema.Resource {

diff --git a/aws/data_source_aws_elb_hosted_zone_id.go b/aws/data_source_aws_elb_hosted_zone_id.go
@@ -10,21 +10,23 @@ import (
 var elbHostedZoneIdPerRegionMap = map[string]string{
 	"ap-northeast-1": "Z14GRHDCWA56QT",
 	"ap-northeast-2": "ZWKZPGTI48KDX",
+	"ap-northeast-3": "Z5LXEXXYW11ES",
 	"ap-south-1":     "ZP97RAFLXTNZK",
 	"ap-southeast-1": "Z1LMS91P8CMLE5",
 	"ap-southeast-2": "Z1GM3OXH4ZPM65",
 	"ca-central-1":   "ZQSVJUPU6J1EY",
+	"cn-north-1":     "638102146993",
 	"eu-central-1":   "Z215JYRZR1TBD5",
+	"eu-north-1":     "Z23TAZ6LKFMNIO",
 	"eu-west-1":      "Z32O12XQLNTSW2",
 	"eu-west-2":      "ZHURV8PSTC4K8",
 	"eu-west-3":      "Z3Q77PNBQS71R4",
+	"sa-east-1":      "Z2P70J7HTTTPLU",
 	"us-east-1":      "Z35SXDOTRQ7X7K",
 	"us-east-2":      "Z3AADJGX6KTTL2",
+	"us-gov-west-1":  "048591011584",
 	"us-west-1":      "Z368ELLRRE2KJ0",
 	"us-west-2":      "Z1H1FL5HABSF5",
-	"sa-east-1":      "Z2P70J7HTTTPLU",
-	"us-gov-west-1":  "048591011584",
-	"cn-north-1":     "638102146993",
 }
 
 func dataSourceAwsElbHostedZoneId() *schema.Resource {

diff --git a/aws/data_source_aws_elb_service_account.go b/aws/data_source_aws_elb_service_account.go
@@ -11,19 +11,22 @@ import (
 var elbAccountIdPerRegionMap = map[string]string{
 	"ap-northeast-1": "582318560864",
 	"ap-northeast-2": "600734575887",
+	"ap-northeast-3": "383597477331",
 	"ap-south-1":     "718504428378",
 	"ap-southeast-1": "114774131450",
 	"ap-southeast-2": "783225319266",
 	"ca-central-1":   "985666609251",
 	"cn-north-1":     "638102146993",
 	"cn-northwest-1": "037604701340",
 	"eu-central-1":   "054676820928",
+	"eu-north-1":     "897822967062",
 	"eu-west-1":      "156460612806",
 	"eu-west-2":      "652711504416",
 	"eu-west-3":      "009996457667",
 	"sa-east-1":      "507241528517",
 	"us-east-1":      "127311923021",
 	"us-east-2":      "033677994240",
+	"us-gov-east-1":  "190560391635",
 	"us-gov-west-1":  "048591011584",
 	"us-west-1":      "027434742980",
 	"us-west-2":      "797873946194",

diff --git a/aws/hosted_zones.go b/aws/hosted_zones.go
@@ -6,22 +6,25 @@ 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{
-	"us-east-1":      "Z3AQBSTGFYJSTF",
-	"us-east-2":      "Z2O1EMRO9K5GLX",
-	"us-west-2":      "Z3BJ6K6RIION7M",
-	"us-west-1":      "Z2F56UZL2M1ACD",
-	"eu-west-1":      "Z1BKCTXD74EZPE",
-	"eu-west-2":      "Z3GKZC51ZF0DB4",
-	"eu-west-3":      "Z3R1K369G5AVDG",
-	"eu-central-1":   "Z21DNDUVLTQW6Q",
+	"ap-northeast-1": "Z2M4EHUR26P7ZW",
+	"ap-northeast-2": "Z3W03O7B5YMIYP",
+	"ap-northeast-3": "Z2YQB5RD63NC85",
 	"ap-south-1":     "Z11RGJOFQNVJUP",
 	"ap-southeast-1": "Z3O0J2DXBE1FTB",
 	"ap-southeast-2": "Z1WCIGYICN2BYD",
-	"ap-northeast-1": "Z2M4EHUR26P7ZW",
-	"ap-northeast-2": "Z3W03O7B5YMIYP",
 	"ca-central-1":   "Z1QDHH18159H29",
+	"eu-central-1":   "Z21DNDUVLTQW6Q",
+	"eu-north-1":     "Z3BAZG2TWCNX0D",
+	"eu-west-1":      "Z1BKCTXD74EZPE",
+	"eu-west-2":      "Z3GKZC51ZF0DB4",
+	"eu-west-3":      "Z3R1K369G5AVDG",
 	"sa-east-1":      "Z7KQH4QJS55SO",
+	"us-east-1":      "Z3AQBSTGFYJSTF",
+	"us-east-2":      "Z2O1EMRO9K5GLX",
+	"us-gov-east-1":  "Z31GFT0UA1I2HV",
 	"us-gov-west-1":  "Z31GFT0UA1I2HV",
+	"us-west-1":      "Z2F56UZL2M1ACD",
+	"us-west-2":      "Z3BJ6K6RIION7M",
 }
 
 // Returns the hosted zone ID for an S3 website endpoint region. This can be