Merge pull request #29103 from PatMyron/patch-1

data_source: ap-southeast-4 (Melbourne)
hashicorp · Feb 9, 2023 · 7354078 · 7354078
2 parents 6070025 + 31bb60c
commit 7354078
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 3 deletions.
diff --git a/.changelog/29103.txt b/.changelog/29103.txt
@@ -0,0 +1,19 @@
+```release-note:enhancement
+data-source/aws_cloudtrail_service_account: Add service account ID for `ap-southeast-4` AWS Region
+```
+
+```release-note:enhancement
+data-source/aws_elb_hosted_zone_id: Add hosted zone ID for `ap-southeast-4` AWS Region
+```
+
+```release-note:enhancement
+data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `ap-southeast-4` AWS Region
+```
+
+```release-note:enhancement
+data-source/aws_s3_bucket: Add hosted zone ID for `ap-southeast-4` AWS Region
+```
+
+```release-note:enhancement
+data-source/aws_s3_bucket: Add hosted zone ID for `ap-south-2` AWS Region
+```
diff --git a/docs/add-a-new-region.md b/docs/add-a-new-region.md
@@ -55,7 +55,7 @@ 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_region) 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 [Elastic Load Balancing Access Logs docs](https://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-access-logs.html#attach-bucket-policy) and add Elastic Load Balancing Account ID if available to [`internal/service/elb/service_account_data_source.go`](https://github.com/hashicorp/terraform-provider-aws/tree/main/internal/service/elb/service_account_data_source.go)
-- Check [Redshift Database Audit Logging docs](https://docs.aws.amazon.com/redshift/latest/mgmt/db-auditing.html#db-auditing-bucket-permissions) and add AWS Account ID if available to [`internal/service/redshift/service_account_data_source.go`](https://github.com/hashicorp/terraform-provider-aws/tree/main/internal/service/redshift/service_account_data_source.go)
+- ~~Check [Elastic Load Balancing Access Logs docs](https://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-access-logs.html#attach-bucket-policy) and add Elastic Load Balancing Account ID if available to [`internal/service/elb/service_account_data_source.go`](https://github.com/hashicorp/terraform-provider-aws/tree/main/internal/service/elb/service_account_data_source.go)~~
+- ~~Check [Redshift Database Audit Logging docs](https://docs.aws.amazon.com/redshift/latest/mgmt/db-auditing.html#db-auditing-bucket-permissions) and add AWS Account ID if available to [`internal/service/redshift/service_account_data_source.go`](https://github.com/hashicorp/terraform-provider-aws/tree/main/internal/service/redshift/service_account_data_source.go)~~
 - Check [AWS Elastic Beanstalk endpoints and quotas](https://docs.aws.amazon.com/general/latest/gr/elasticbeanstalk.html#elasticbeanstalk_region) 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/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go
@@ -26,6 +26,7 @@ var ServiceAccountPerRegionMap = map[string]string{
 	endpoints.ApSoutheast1RegionID: "903692715234",
 	endpoints.ApSoutheast2RegionID: "284668455005",
 	endpoints.ApSoutheast3RegionID: "069019280451",
+	endpoints.ApSoutheast4RegionID: "187074758985",
 	endpoints.CaCentral1RegionID:   "819402241893",
 	endpoints.CnNorth1RegionID:     "193415116832",
 	endpoints.CnNorthwest1RegionID: "681348832753",

diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go
@@ -24,6 +24,7 @@ var HostedZoneIdPerRegionMap = map[string]string{
 	endpoints.ApSoutheast1RegionID: "Z1LMS91P8CMLE5",
 	endpoints.ApSoutheast2RegionID: "Z1GM3OXH4ZPM65",
 	endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER",
+	endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F",
 	endpoints.CaCentral1RegionID:   "ZQSVJUPU6J1EY",
 	endpoints.CnNorth1RegionID:     "Z1GDH35T77C1KE",
 	endpoints.CnNorthwest1RegionID: "ZM7IZAIOVVDZF",

diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go
@@ -26,6 +26,7 @@ var HostedZoneIdPerRegionALBMap = map[string]string{
 	endpoints.ApSoutheast1RegionID: "Z1LMS91P8CMLE5",
 	endpoints.ApSoutheast2RegionID: "Z1GM3OXH4ZPM65",
 	endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER",
+	endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F",
 	endpoints.CaCentral1RegionID:   "ZQSVJUPU6J1EY",
 	endpoints.CnNorth1RegionID:     "Z1GDH35T77C1KE",
 	endpoints.CnNorthwest1RegionID: "ZM7IZAIOVVDZF",
@@ -61,6 +62,7 @@ var HostedZoneIdPerRegionNLBMap = map[string]string{
 	endpoints.ApSoutheast1RegionID: "ZKVM4W9LS7TM",
 	endpoints.ApSoutheast2RegionID: "ZCT6FZBF4DROD",
 	endpoints.ApSoutheast3RegionID: "Z01971771FYVNCOVWJU1G",
+	endpoints.ApSoutheast4RegionID: "Z01156963G8MIIL7X90IV",
 	endpoints.CaCentral1RegionID:   "Z2EPGBW3API2WT",
 	endpoints.CnNorth1RegionID:     "Z3QFB96KMJ7ED6",
 	endpoints.CnNorthwest1RegionID: "ZQEIKTCZ8352D",

diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go
@@ -14,9 +14,11 @@ var hostedZoneIDsMap = map[string]string{
 	endpoints.ApNortheast2RegionID: "Z3W03O7B5YMIYP",
 	endpoints.ApNortheast3RegionID: "Z2YQB5RD63NC85",
 	endpoints.ApSouth1RegionID:     "Z11RGJOFQNVJUP",
+	endpoints.ApSouth2RegionID:     "Z02976202B4EZMXIPMXF7",
 	endpoints.ApSoutheast1RegionID: "Z3O0J2DXBE1FTB",
 	endpoints.ApSoutheast2RegionID: "Z1WCIGYICN2BYD",
-	endpoints.ApSoutheast3RegionID: "Z01613992JD795ZI93075",
+	endpoints.ApSoutheast3RegionID: "Z01846753K324LI26A3VV",
+	endpoints.ApSoutheast4RegionID: "Z0312387243XT5FE14WFO",
 	endpoints.CaCentral1RegionID:   "Z1QDHH18159H29",
 	endpoints.CnNorthwest1RegionID: "Z282HJ1KT0DH03",
 	endpoints.EuCentral1RegionID:   "Z21DNDUVLTQW6Q",