Skip to content

Commit c5cbb95

Browse files
authored
Merge pull request #44132 from hashicorp/f-ap-southeast-6
Support new AWS Asia Pacific (New Zealand) Region `ap-southeast-6` in data sources
2 parents 25c5278 + 1b55a6b commit c5cbb95

File tree

5 files changed

+46
-15
lines changed

5 files changed

+46
-15
lines changed

.changelog/44132.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
```release-note:enhancement
2+
data-source/aws_elb_hosted_zone_id: Add hosted zone ID for `ap-southeast-6` AWS Region
3+
```
4+
5+
```release-note:enhancement
6+
data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `ap-southeast-6` AWS Region
7+
```
8+
9+
```release-note:enhancement
10+
data-source/aws_elastic_beanstalk_hosted_zone: Add hosted zone IDs for `ap-southeast-5`, `ap-southeast-7`, `eu-south-2`, and `me-central-1` AWS Regions
11+
```
12+
13+
```release-note:enhancement
14+
data-source/aws_s3_bucket: Add hosted zone ID for `ap-southeast-6` AWS Region
15+
```

internal/service/elasticbeanstalk/hosted_zone_data_source.go

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,44 @@ import (
1717
// See https://docs.aws.amazon.com/general/latest/gr/elasticbeanstalk.html
1818

1919
var hostedZoneIDs = map[string]string{
20-
endpoints.AfSouth1RegionID: "Z1EI3BVKMKK4AM",
21-
endpoints.ApSoutheast1RegionID: "Z16FZ9L249IFLT",
22-
endpoints.ApSoutheast2RegionID: "Z2PCDNR3VC2G1N",
23-
endpoints.ApSoutheast3RegionID: "Z05913172VM7EAZB40TA8",
24-
endpoints.ApEast1RegionID: "ZPWYUBWRU171A",
20+
endpoints.AfSouth1RegionID: "Z1EI3BVKMKK4AM",
21+
endpoints.ApEast1RegionID: "ZPWYUBWRU171A",
22+
// endpoints.ApEast2RegionID: "",
2523
endpoints.ApNortheast1RegionID: "Z1R25G3KIG2GBW",
2624
endpoints.ApNortheast2RegionID: "Z3JE5OI70TWKCP",
2725
endpoints.ApNortheast3RegionID: "ZNE5GEY1TIAGY",
2826
endpoints.ApSouth1RegionID: "Z18NTBI3Y7N9TZ",
27+
// endpoints.ApSouth2RegionID: "",
28+
endpoints.ApSoutheast1RegionID: "Z16FZ9L249IFLT",
29+
endpoints.ApSoutheast2RegionID: "Z2PCDNR3VC2G1N",
30+
endpoints.ApSoutheast3RegionID: "Z05913172VM7EAZB40TA8",
31+
// endpoints.ApSoutheast4RegionID: "",
32+
endpoints.ApSoutheast5RegionID: "Z18NTBI3Y7N9TZ",
33+
// endpoints.ApSoutheast6RegionID: "",
34+
endpoints.ApSoutheast7RegionID: "Z1R25G3KIG2GBW",
2935
endpoints.CaCentral1RegionID: "ZJFCZL7SSZB5I",
30-
endpoints.EuCentral1RegionID: "Z1FRNW7UH4DEZJ",
31-
endpoints.EuNorth1RegionID: "Z23GO28BZ5AETM",
32-
endpoints.EuSouth1RegionID: "Z10VDYYOA2JFKM",
33-
endpoints.EuWest1RegionID: "Z2NYPWQ7DFZAZH",
34-
endpoints.EuWest2RegionID: "Z1GKAAAUGATPF1",
35-
endpoints.EuWest3RegionID: "Z5WN6GAYWG5OB",
36-
endpoints.IlCentral1RegionID: "Z02941091PERNCB1MI5H7",
37-
// endpoints.MeCentral1RegionID: "",
36+
// endpoints.CaWest1RegionID: "",
37+
// endpoints.CnNorth1RegionID: "",
38+
// endpoints.CnNorthwest1RegionID: "",
39+
endpoints.EuCentral1RegionID: "Z1FRNW7UH4DEZJ",
40+
// endpoints.EuCentral2RegionID: "",
41+
endpoints.EuNorth1RegionID: "Z23GO28BZ5AETM",
42+
endpoints.EuSouth1RegionID: "Z10VDYYOA2JFKM",
43+
endpoints.EuSouth2RegionID: "Z23GO28BZ5AETM",
44+
endpoints.EuWest1RegionID: "Z2NYPWQ7DFZAZH",
45+
endpoints.EuWest2RegionID: "Z1GKAAAUGATPF1",
46+
endpoints.EuWest3RegionID: "Z5WN6GAYWG5OB",
47+
endpoints.IlCentral1RegionID: "Z02941091PERNCB1MI5H7",
48+
endpoints.MeCentral1RegionID: "Z10X7K2B4QSOFV",
3849
endpoints.MeSouth1RegionID: "Z2BBTEKR2I36N2",
50+
// endpoints.MxCentral1RegionID: "",
3951
endpoints.SaEast1RegionID: "Z10X7K2B4QSOFV",
4052
endpoints.UsEast1RegionID: "Z117KPS5GTRQ2G",
4153
endpoints.UsEast2RegionID: "Z14LCN19Q5QHIC",
42-
endpoints.UsWest1RegionID: "Z1LQECGX5PH1X",
43-
endpoints.UsWest2RegionID: "Z38NKT9BP95V3O",
4454
endpoints.UsGovEast1RegionID: "Z35TSARG0EJ4VU",
4555
endpoints.UsGovWest1RegionID: "Z4KAURWC4UUUG",
56+
endpoints.UsWest1RegionID: "Z1LQECGX5PH1X",
57+
endpoints.UsWest2RegionID: "Z38NKT9BP95V3O",
4658
}
4759

4860
// @SDKDataSource("aws_elastic_beanstalk_hosted_zone", name="Hosted Zone")

internal/service/elb/hosted_zone_id_data_source.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ var hostedZoneIDPerRegionMap = map[string]string{
2828
endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER",
2929
endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F",
3030
endpoints.ApSoutheast5RegionID: "Z06010284QMVVW7WO5J",
31+
endpoints.ApSoutheast6RegionID: "Z023301818UFJ50CIO0MV",
3132
endpoints.ApSoutheast7RegionID: "Z0390008CMBRTHFGWBCB",
3233
endpoints.CaCentral1RegionID: "ZQSVJUPU6J1EY",
3334
endpoints.CaWest1RegionID: "Z06473681N0SF6OS049SD",

internal/service/elbv2/hosted_zone_id_data_source.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{
3131
endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER",
3232
endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F",
3333
endpoints.ApSoutheast5RegionID: "Z06010284QMVVW7WO5J",
34+
endpoints.ApSoutheast6RegionID: "Z023301818UFJ50CIO0MV",
3435
endpoints.ApSoutheast7RegionID: "Z0390008CMBRTHFGWBCB",
3536
endpoints.CaCentral1RegionID: "ZQSVJUPU6J1EY",
3637
endpoints.CaWest1RegionID: "Z06473681N0SF6OS049SD",
@@ -72,6 +73,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{
7273
endpoints.ApSoutheast3RegionID: "Z01971771FYVNCOVWJU1G",
7374
endpoints.ApSoutheast4RegionID: "Z01156963G8MIIL7X90IV",
7475
endpoints.ApSoutheast5RegionID: "Z026317210H9ACVTRO6FB",
76+
endpoints.ApSoutheast6RegionID: "Z01392953RKV2Q3RBP0KU",
7577
endpoints.ApSoutheast7RegionID: "Z054363131YWATEMWRG5L",
7678
endpoints.CaCentral1RegionID: "Z2EPGBW3API2WT",
7779
endpoints.CaWest1RegionID: "Z02754302KBB00W2LKWZ9",

internal/service/s3/hosted_zones.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var hostedZoneIDsMap = map[string]string{
2424
endpoints.ApSoutheast3RegionID: "Z01846753K324LI26A3VV",
2525
endpoints.ApSoutheast4RegionID: "Z0312387243XT5FE14WFO",
2626
endpoints.ApSoutheast5RegionID: "Z08660063OXLMA7F1FJHU",
27+
endpoints.ApSoutheast6RegionID: "Z05686083R66JX5C163TC",
2728
endpoints.ApSoutheast7RegionID: "Z0031014GXUMRZG6I14G",
2829
endpoints.CaCentral1RegionID: "Z1QDHH18159H29",
2930
endpoints.CaWest1RegionID: "Z03565811Z33SLEZTHOUL",

0 commit comments

Comments
 (0)