Merge pull request #39052 from hashicorp/f-ap-southeast-5

Support new AWS Asia Pacific (Malaysia) Region `ap-southeast-5` in data sources
hashicorp · Aug 27, 2024 · 69b9e15 · 69b9e15
2 parents bd58576 + 5499c6d
commit 69b9e15
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 1 deletion.
diff --git a/.changelog/39052.txt b/.changelog/39052.txt
@@ -0,0 +1,11 @@
+```release-note:enhancement
+data-source/aws_elb_hosted_zone_id: Add hosted zone ID for `ap-southeast-5` AWS Region
+```
+
+```release-note:enhancement
+data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `ap-southeast-5` AWS Region
+```
+
+```release-note:enhancement
+data-source/aws_s3_bucket: Add hosted zone ID for `ap-southeast-5` AWS Region
+```
diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go
@@ -26,6 +26,7 @@ var hostedZoneIDPerRegionMap = map[string]string{
  names.APSoutheast2RegionID: "Z1GM3OXH4ZPM65",
  names.APSoutheast3RegionID: "Z08888821HLRG5A9ZRTER",
  names.APSoutheast4RegionID: "Z09517862IB2WZLPXG76F",
+ names.APSoutheast5RegionID: "Z06010284QMVVW7WO5J",
  names.CACentral1RegionID: "ZQSVJUPU6J1EY",
  names.CAWest1RegionID: "Z06473681N0SF6OS049SD",
  names.CNNorth1RegionID: "Z1GDH35T77C1KE",

diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go
@@ -30,6 +30,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{
  names.APSoutheast2RegionID: "Z1GM3OXH4ZPM65",
  names.APSoutheast3RegionID: "Z08888821HLRG5A9ZRTER",
  names.APSoutheast4RegionID: "Z09517862IB2WZLPXG76F",
+ names.APSoutheast5RegionID: "Z06010284QMVVW7WO5J",
  names.CACentral1RegionID: "ZQSVJUPU6J1EY",
  names.CAWest1RegionID: "Z06473681N0SF6OS049SD",
  names.CNNorth1RegionID: "Z1GDH35T77C1KE",
@@ -67,6 +68,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{
  names.APSoutheast2RegionID: "ZCT6FZBF4DROD",
  names.APSoutheast3RegionID: "Z01971771FYVNCOVWJU1G",
  names.APSoutheast4RegionID: "Z01156963G8MIIL7X90IV",
+ names.APSoutheast5RegionID: "Z026317210H9ACVTRO6FB",
  names.CACentral1RegionID: "Z2EPGBW3API2WT",
  names.CAWest1RegionID: "Z02754302KBB00W2LKWZ9",
  names.CNNorth1RegionID: "Z3QFB96KMJ7ED6",

diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go
@@ -22,6 +22,7 @@ var hostedZoneIDsMap = map[string]string{
  names.APSoutheast2RegionID: "Z1WCIGYICN2BYD",
  names.APSoutheast3RegionID: "Z01846753K324LI26A3VV",
  names.APSoutheast4RegionID: "Z0312387243XT5FE14WFO",
+ names.APSoutheast5RegionID: "Z08660063OXLMA7F1FJHU",
  names.CACentral1RegionID: "Z1QDHH18159H29",
  names.CAWest1RegionID: "Z03565811Z33SLEZTHOUL",
  names.CNNorth1RegionID: "Z5CN8UMXT92WN",

diff --git a/names/names.go b/names/names.go
@@ -168,6 +168,7 @@ const (
  APSoutheast2RegionID = "ap-southeast-2" // Asia Pacific (Sydney).
  APSoutheast3RegionID = "ap-southeast-3" // Asia Pacific (Jakarta).
  APSoutheast4RegionID = "ap-southeast-4" // Asia Pacific (Melbourne).
+ APSoutheast5RegionID = "ap-southeast-5" // Asia Pacific (Malaysia).
  CACentral1RegionID = "ca-central-1" // Canada (Central).
  CAWest1RegionID = "ca-west-1" // Canada West (Calgary).
  EUCentral1RegionID = "eu-central-1" // Europe (Frankfurt).
@@ -218,6 +219,7 @@ var allRegionIDs = []string{
  APSoutheast2RegionID,
  APSoutheast3RegionID,
  APSoutheast4RegionID,
+ APSoutheast5RegionID,
  CACentral1RegionID,
  CAWest1RegionID,
  EUCentral1RegionID,
@@ -318,7 +320,7 @@ func IsOptInRegion(region string) bool {
  switch region {
  case AFSouth1RegionID,
  APEast1RegionID, APSouth2RegionID,
- APSoutheast3RegionID, APSoutheast4RegionID,
+ APSoutheast3RegionID, APSoutheast4RegionID, APSoutheast5RegionID,
  CAWest1RegionID,
  EUCentral2RegionID,
  EUSouth1RegionID, EUSouth2RegionID,