Merge pull request #35131 from hashicorp/f-ca-west-1

Support new AWS Canada West (Calgary) Region `ca-west-1` in data sources
hashicorp · Jan 5, 2024 · f1a7314 · f1a7314
2 parents 9a2129b + 3d2fc68
commit f1a7314
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 1 deletion.
diff --git a/.changelog/35131.txt b/.changelog/35131.txt
@@ -0,0 +1,19 @@
+```release-note:enhancement
+data-source/aws_elb_hosted_zone_id: Add hosted zone ID for `ca-west-1` AWS Region
+```
+
+```release-note:enhancement
+data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `ca-west-1` AWS Region
+```
+
+```release-note:enhancement
+data-source/aws_s3_bucket: Add hosted zone ID for `ca-west-1` AWS Region
+```
+
+```release-note:enhancement
+data-source/aws_elastic_beanstalk_hosted_zone: Add hosted zone ID for `il-central-1` AWS Region
+```
+
+```release-note:enhancement
+provider: Support `ca-west-1` as a valid AWS Region
+```
diff --git a/docs/add-a-new-region.md b/docs/add-a-new-region.md
@@ -54,6 +54,5 @@ Some data sources include static values specific to regions that are not availab
 
 - Check [Elastic Load Balancing endpoints and quotas](https://docs.aws.amazon.com/general/latest/gr/elb.html#elb_region) and add Route53 Hosted Zone ID if available to [`internal/service/elb/hosted_zone_id_data_source.go`](https://github.com/hashicorp/terraform-provider-aws/tree/main/internal/service/elb/hosted_zone_id_data_source.go) and [`internal/service/elbv2/hosted_zone_id_data_source.go`](https://github.com/hashicorp/terraform-provider-aws/tree/main/internal/service/elbv2/hosted_zone_id_data_source.go)
 - Check [Amazon Simple Storage Service endpoints and quotas](https://docs.aws.amazon.com/general/latest/gr/s3.html#s3_website_region_endpoints) and add Route53 Hosted Zone ID if available to [`internal/service/s3/hosted_zones.go`](https://github.com/hashicorp/terraform-provider-aws/tree/main/internal/service/s3/hosted_zones.go)
-- Check [CloudTrail Supported Regions docs](https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-supported-regions.html#cloudtrail-supported-regions) and add AWS Account ID if available to [`internal/service/cloudtrail/service_account_data_source.go`](https://github.com/hashicorp/terraform-provider-aws/tree/main/internal/service/cloudtrail/service_account_data_source.go)
 - Check [AWS Elastic Beanstalk endpoints and quotas](https://docs.aws.amazon.com/general/latest/gr/elasticbeanstalk.html) and add Route53 Hosted Zone ID if available to [`internal/service/elasticbeanstalk/hosted_zone_data_source.go`](https://github.com/hashicorp/terraform-provider-aws/tree/main/internal/service/elasticbeanstalk/hosted_zone_data_source.go)
 - Check [SageMaker docs](https://docs.aws.amazon.com/sagemaker/latest/dg/sagemaker-algo-docker-registry-paths.html) and add AWS Account IDs if available to [`internal/service/sagemaker/prebuilt_ecr_image_data_source.go`](https://github.com/hashicorp/terraform-provider-aws/tree/main/internal/service/sagemaker/prebuilt_ecr_image_data_source.go)
diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go
@@ -32,6 +32,7 @@ var HostedZoneIDs = map[string]string{
 	endpoints.EuWest1RegionID:      "Z2NYPWQ7DFZAZH",
 	endpoints.EuWest2RegionID:      "Z1GKAAAUGATPF1",
 	endpoints.EuWest3RegionID:      "Z5WN6GAYWG5OB",
+	endpoints.IlCentral1RegionID:   "Z02941091PERNCB1MI5H7",
 	// endpoints.MeCentral1RegionID:   "",
 	endpoints.MeSouth1RegionID:   "Z2BBTEKR2I36N2",
 	endpoints.SaEast1RegionID:    "Z10X7K2B4QSOFV",

diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go
@@ -28,6 +28,7 @@ var HostedZoneIdPerRegionMap = map[string]string{
 	endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER",
 	endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F",
 	endpoints.CaCentral1RegionID:   "ZQSVJUPU6J1EY",
+	endpoints.CaWest1RegionID:      "Z06473681N0SF6OS049SD",
 	endpoints.CnNorth1RegionID:     "Z1GDH35T77C1KE",
 	endpoints.CnNorthwest1RegionID: "ZM7IZAIOVVDZF",
 	endpoints.EuCentral1RegionID:   "Z215JYRZR1TBD5",

diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go
@@ -31,6 +31,7 @@ var HostedZoneIdPerRegionALBMap = map[string]string{
 	endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER",
 	endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F",
 	endpoints.CaCentral1RegionID:   "ZQSVJUPU6J1EY",
+	endpoints.CaWest1RegionID:      "Z06473681N0SF6OS049SD",
 	endpoints.CnNorth1RegionID:     "Z1GDH35T77C1KE",
 	endpoints.CnNorthwest1RegionID: "ZM7IZAIOVVDZF",
 	endpoints.EuCentral1RegionID:   "Z215JYRZR1TBD5",
@@ -68,6 +69,7 @@ var HostedZoneIdPerRegionNLBMap = map[string]string{
 	endpoints.ApSoutheast3RegionID: "Z01971771FYVNCOVWJU1G",
 	endpoints.ApSoutheast4RegionID: "Z01156963G8MIIL7X90IV",
 	endpoints.CaCentral1RegionID:   "Z2EPGBW3API2WT",
+	endpoints.CaWest1RegionID:      "Z02754302KBB00W2LKWZ9",
 	endpoints.CnNorth1RegionID:     "Z3QFB96KMJ7ED6",
 	endpoints.CnNorthwest1RegionID: "ZQEIKTCZ8352D",
 	endpoints.EuCentral1RegionID:   "Z3F0SRJ5LGBH90",

diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go
@@ -23,6 +23,7 @@ var hostedZoneIDsMap = map[string]string{
 	names.APSoutheast3RegionID: "Z01846753K324LI26A3VV",
 	names.APSoutheast4RegionID: "Z0312387243XT5FE14WFO",
 	names.CACentral1RegionID:   "Z1QDHH18159H29",
+	names.CAWest1RegionID:      "Z03565811Z33SLEZTHOUL",
 	names.CNNorth1RegionID:     "Z5CN8UMXT92WN",
 	names.CNNorthwest1RegionID: "Z282HJ1KT0DH03",
 	names.EUCentral1RegionID:   "Z21DNDUVLTQW6Q",

diff --git a/website/docs/d/cloudtrail_service_account.html.markdown b/website/docs/d/cloudtrail_service_account.html.markdown
@@ -11,6 +11,8 @@ description: |-
 Use this data source to get the Account ID of the [AWS CloudTrail Service Account](http://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-supported-regions.html)
 in a given region for the purpose of allowing CloudTrail to store trail data in S3.
 
+~> **Note:** AWS documentation [states that](https://docs.aws.amazon.com/awscloudtrail/latest/userguide/create-s3-bucket-policy-for-cloudtrail.html#troubleshooting-s3-bucket-policy) a [service principal name](https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_elements_principal.html#principal-services) should be used instead of an AWS account ID in any relevant IAM policy.
+
 ## Example Usage
 
 ```terraform