Merge pull request #3142 from kwerey/cn-northwest-1-3053

Support AWS cn-northwest-1 Ningxia (fixes #3053)
hashicorp · Jan 26, 2018 · bf7787d · bf7787d
2 parents ec4ff49 + e11c7df
commit bf7787d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/aws/config.go b/aws/config.go
@@ -226,6 +226,9 @@ func (c *AWSClient) IsChinaCloud() bool {
 	if c.region == "cn-north-1" {
 		return true
 	}
+	if c.region == "cn-northwest-1" {
+		return true
+	}
 	return false
 }
 
@@ -506,6 +509,7 @@ func (c *Config) ValidateRegion() error {
 		"ap-southeast-2",
 		"ca-central-1",
 		"cn-north-1",
+		"cn-northwest-1",
 		"eu-central-1",
 		"eu-west-1",
 		"eu-west-2",

diff --git a/aws/data_source_aws_cloudtrail_service_account.go b/aws/data_source_aws_cloudtrail_service_account.go
@@ -23,6 +23,7 @@ var cloudTrailServiceAccountPerRegionMap = map[string]string{
 	"eu-west-2":      "282025262664",
 	"eu-west-3":      "262312530599",
 	"sa-east-1":      "814480443879",
+	"cn-northwest-1": "681348832753",
 }
 
 func dataSourceAwsCloudTrailServiceAccount() *schema.Resource {

diff --git a/aws/data_source_aws_elb_service_account.go b/aws/data_source_aws_elb_service_account.go
@@ -15,6 +15,7 @@ var elbAccountIdPerRegionMap = map[string]string{
 	"ap-southeast-2": "783225319266",
 	"ca-central-1":   "985666609251",
 	"cn-north-1":     "638102146993",
+	"cn-northwest-1": "037604701340",
 	"eu-central-1":   "054676820928",
 	"eu-west-1":      "156460612806",
 	"eu-west-2":      "652711504416",

diff --git a/aws/data_source_aws_redshift_service_account.go b/aws/data_source_aws_redshift_service_account.go
@@ -18,6 +18,7 @@ var redshiftServiceAccountPerRegionMap = map[string]string{
 	"ap-southeast-2": "762762565011",
 	"ap-northeast-1": "404641285394",
 	"ca-central-1":   "907379612154",
+	"cn-northwest-1": "660998842044",
 	"eu-central-1":   "053454850223",
 	"eu-west-1":      "210876761215",
 	"eu-west-2":      "307160386991",