Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support new AWS Middle East (UAE) Region me-central-1 #26572

Merged
merged 12 commits into from
Sep 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .changelog/26572.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
```release-note:enhancement
data-source/aws_cloudtrail_service_account: Add service account ID for `me-central-1` AWS Region
```

```release-note:enhancement
data-source/aws_elb_hosted_zone_id: Add hosted zone ID for `me-central-1` AWS Region
```

```release-note:enhancement
data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `me-central-1` AWS Region
```

```release-note:enhancement
data-source/aws_s3_bucket: Add hosted zone ID for `me-central-1` AWS Region
```
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ var ServiceAccountPerRegionMap = map[string]string{
endpoints.EuWest1RegionID: "859597730677",
endpoints.EuWest2RegionID: "282025262664",
endpoints.EuWest3RegionID: "262312530599",
endpoints.MeCentral1RegionID: "585772288577",
endpoints.MeSouth1RegionID: "034638983726",
endpoints.SaEast1RegionID: "814480443879",
endpoints.UsEast1RegionID: "086441151436",
Expand Down
17 changes: 9 additions & 8 deletions internal/service/elasticbeanstalk/hosted_zone_data_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@ var HostedZoneIDs = map[string]string{
endpoints.EuWest1RegionID: "Z2NYPWQ7DFZAZH",
endpoints.EuWest2RegionID: "Z1GKAAAUGATPF1",
endpoints.EuWest3RegionID: "Z5WN6GAYWG5OB",
endpoints.MeSouth1RegionID: "Z2BBTEKR2I36N2",
endpoints.SaEast1RegionID: "Z10X7K2B4QSOFV",
endpoints.UsEast1RegionID: "Z117KPS5GTRQ2G",
endpoints.UsEast2RegionID: "Z14LCN19Q5QHIC",
endpoints.UsWest1RegionID: "Z1LQECGX5PH1X",
endpoints.UsWest2RegionID: "Z38NKT9BP95V3O",
endpoints.UsGovEast1RegionID: "Z35TSARG0EJ4VU",
endpoints.UsGovWest1RegionID: "Z4KAURWC4UUUG",
// endpoints.MeCentral1RegionID: "",
endpoints.MeSouth1RegionID: "Z2BBTEKR2I36N2",
endpoints.SaEast1RegionID: "Z10X7K2B4QSOFV",
endpoints.UsEast1RegionID: "Z117KPS5GTRQ2G",
endpoints.UsEast2RegionID: "Z14LCN19Q5QHIC",
endpoints.UsWest1RegionID: "Z1LQECGX5PH1X",
endpoints.UsWest2RegionID: "Z38NKT9BP95V3O",
endpoints.UsGovEast1RegionID: "Z35TSARG0EJ4VU",
endpoints.UsGovWest1RegionID: "Z4KAURWC4UUUG",
}

func DataSourceHostedZone() *schema.Resource {
Expand Down
1 change: 1 addition & 0 deletions internal/service/elb/hosted_zone_id_data_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ var HostedZoneIdPerRegionMap = map[string]string{
endpoints.EuWest1RegionID: "Z32O12XQLNTSW2",
endpoints.EuWest2RegionID: "ZHURV8PSTC4K8",
endpoints.EuWest3RegionID: "Z3Q77PNBQS71R4",
endpoints.MeCentral1RegionID: "Z08230872XQRWHG2XF6I",
endpoints.MeSouth1RegionID: "ZS929ML54UICD",
endpoints.SaEast1RegionID: "Z2P70J7HTTTPLU",
endpoints.UsEast1RegionID: "Z35SXDOTRQ7X7K",
Expand Down
17 changes: 9 additions & 8 deletions internal/service/elb/service_account_data_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@ var AccountIdPerRegionMap = map[string]string{
endpoints.EuWest1RegionID: "156460612806",
endpoints.EuWest2RegionID: "652711504416",
endpoints.EuWest3RegionID: "009996457667",
endpoints.MeSouth1RegionID: "076674570225",
endpoints.SaEast1RegionID: "507241528517",
endpoints.UsEast1RegionID: "127311923021",
endpoints.UsEast2RegionID: "033677994240",
endpoints.UsGovEast1RegionID: "190560391635",
endpoints.UsGovWest1RegionID: "048591011584",
endpoints.UsWest1RegionID: "027434742980",
endpoints.UsWest2RegionID: "797873946194",
// endpoints.MeCentral1RegionID: "",
endpoints.MeSouth1RegionID: "076674570225",
endpoints.SaEast1RegionID: "507241528517",
endpoints.UsEast1RegionID: "127311923021",
endpoints.UsEast2RegionID: "033677994240",
endpoints.UsGovEast1RegionID: "190560391635",
endpoints.UsGovWest1RegionID: "048591011584",
endpoints.UsWest1RegionID: "027434742980",
endpoints.UsWest2RegionID: "797873946194",
}

func DataSourceServiceAccount() *schema.Resource {
Expand Down
2 changes: 2 additions & 0 deletions internal/service/elbv2/hosted_zone_id_data_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ var HostedZoneIdPerRegionALBMap = map[string]string{
endpoints.EuWest1RegionID: "Z32O12XQLNTSW2",
endpoints.EuWest2RegionID: "ZHURV8PSTC4K8",
endpoints.EuWest3RegionID: "Z3Q77PNBQS71R4",
endpoints.MeCentral1RegionID: "Z08230872XQRWHG2XF6I",
endpoints.MeSouth1RegionID: "ZS929ML54UICD",
endpoints.SaEast1RegionID: "Z2P70J7HTTTPLU",
endpoints.UsEast1RegionID: "Z35SXDOTRQ7X7K",
Expand Down Expand Up @@ -63,6 +64,7 @@ var HostedZoneIdPerRegionNLBMap = map[string]string{
endpoints.EuWest1RegionID: "Z2IFOLAFXWLO4F",
endpoints.EuWest2RegionID: "ZD4D7Y8KGAS4G",
endpoints.EuWest3RegionID: "Z1CMS0P5QUZ6D5",
endpoints.MeCentral1RegionID: "Z00282643NTTLPANJJG2P",
endpoints.MeSouth1RegionID: "Z3QSRYVP46NYYV",
endpoints.SaEast1RegionID: "ZTK26PT1VY4CU",
endpoints.UsEast1RegionID: "Z26RNL4JYFTOTI",
Expand Down
4 changes: 2 additions & 2 deletions internal/service/lambda/function.go
Original file line number Diff line number Diff line change
Expand Up @@ -893,12 +893,12 @@ func resourceFunctionRead(d *schema.ResourceData, meta interface{}) error {
return nil
}

// Currently, this functionality is not enabled in ap-northeast-3 (Osaka) and ap-southeast-3 (Jakarta) region
// Currently, this functionality is not enabled in ap-northeast-3 (Osaka), me-central-1 (UAE) and ap-southeast-3 (Jakarta) region
// and returns ambiguous error codes (e.g. AccessDeniedException)
// so we cannot just ignore the error as would typically.
// We are hardcoding the region here, because go aws sdk endpoints
// package does not support Signer service
if region := meta.(*conns.AWSClient).Region; region == endpoints.ApNortheast3RegionID || region == endpoints.ApSoutheast3RegionID {
if region := meta.(*conns.AWSClient).Region; region == endpoints.ApNortheast3RegionID || region == endpoints.MeCentral1RegionID || region == endpoints.ApSoutheast3RegionID {
return nil
}

Expand Down
17 changes: 9 additions & 8 deletions internal/service/redshift/service_account_data_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@ var ServiceAccountPerRegionMap = map[string]string{
endpoints.EuWest1RegionID: "210876761215",
endpoints.EuWest2RegionID: "307160386991",
endpoints.EuWest3RegionID: "915173422425",
endpoints.MeSouth1RegionID: "013126148197",
endpoints.SaEast1RegionID: "075028567923",
endpoints.UsEast1RegionID: "193672423079",
endpoints.UsEast2RegionID: "391106570357",
endpoints.UsGovEast1RegionID: "665727464434",
endpoints.UsGovWest1RegionID: "665727464434",
endpoints.UsWest1RegionID: "262260360010",
endpoints.UsWest2RegionID: "902366379725",
// endpoints.MeCentral1RegionID: "",
endpoints.MeSouth1RegionID: "013126148197",
endpoints.SaEast1RegionID: "075028567923",
endpoints.UsEast1RegionID: "193672423079",
endpoints.UsEast2RegionID: "391106570357",
endpoints.UsGovEast1RegionID: "665727464434",
endpoints.UsGovWest1RegionID: "665727464434",
endpoints.UsWest1RegionID: "262260360010",
endpoints.UsWest2RegionID: "902366379725",
}

func DataSourceServiceAccount() *schema.Resource {
Expand Down
1 change: 1 addition & 0 deletions internal/service/s3/hosted_zones.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ var hostedZoneIDsMap = map[string]string{
endpoints.EuWest1RegionID: "Z1BKCTXD74EZPE",
endpoints.EuWest2RegionID: "Z3GKZC51ZF0DB4",
endpoints.EuWest3RegionID: "Z3R1K369G5AVDG",
endpoints.MeCentral1RegionID: "Z06143092I8HRXZRUZROF",
endpoints.MeSouth1RegionID: "Z1MPMWCPA7YB62",
endpoints.SaEast1RegionID: "Z7KQH4QJS55SO",
endpoints.UsEast1RegionID: "Z3AQBSTGFYJSTF",
Expand Down
103 changes: 55 additions & 48 deletions internal/service/sagemaker/prebuilt_ecr_image_data_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,14 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{
endpoints.EuWest1RegionID: "685385470294",
endpoints.EuWest2RegionID: "644912444149",
endpoints.EuWest3RegionID: "749696950732",
endpoints.MeSouth1RegionID: "249704162688",
endpoints.SaEast1RegionID: "855470959533",
endpoints.UsEast1RegionID: "811284229777",
endpoints.UsEast2RegionID: "825641698319",
endpoints.UsGovWest1RegionID: "226302683700",
endpoints.UsWest1RegionID: "632365934929",
endpoints.UsWest2RegionID: "433757028032",
// endpoints.MeCentral1RegionID: "",
endpoints.MeSouth1RegionID: "249704162688",
endpoints.SaEast1RegionID: "855470959533",
endpoints.UsEast1RegionID: "811284229777",
endpoints.UsEast2RegionID: "825641698319",
endpoints.UsGovWest1RegionID: "226302683700",
endpoints.UsWest1RegionID: "632365934929",
endpoints.UsWest2RegionID: "433757028032",
}

// https://docs.aws.amazon.com/sagemaker/latest/dg/sagemaker-algo-docker-registry-paths.html
Expand All @@ -128,13 +129,14 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{
endpoints.EuWest1RegionID: "224300973850",
endpoints.EuWest2RegionID: "644912444149",
endpoints.EuWest3RegionID: "749696950732",
endpoints.MeSouth1RegionID: "249704162688",
endpoints.SaEast1RegionID: "855470959533",
endpoints.UsEast1RegionID: "522234722520",
endpoints.UsEast2RegionID: "566113047672",
endpoints.UsGovWest1RegionID: "226302683700",
endpoints.UsWest1RegionID: "632365934929",
endpoints.UsWest2RegionID: "156387875391",
// endpoints.MeCentral1RegionID: "",
endpoints.MeSouth1RegionID: "249704162688",
endpoints.SaEast1RegionID: "855470959533",
endpoints.UsEast1RegionID: "522234722520",
endpoints.UsEast2RegionID: "566113047672",
endpoints.UsGovWest1RegionID: "226302683700",
endpoints.UsWest1RegionID: "632365934929",
endpoints.UsWest2RegionID: "156387875391",
}

// https://docs.aws.amazon.com/sagemaker/latest/dg/sagemaker-algo-docker-registry-paths.html
Expand All @@ -157,13 +159,14 @@ var PrebuiltECRImageIDByRegion_factorMachines = map[string]string{
endpoints.EuWest1RegionID: "438346466558",
endpoints.EuWest2RegionID: "644912444149",
endpoints.EuWest3RegionID: "749696950732",
endpoints.MeSouth1RegionID: "249704162688",
endpoints.SaEast1RegionID: "855470959533",
endpoints.UsEast1RegionID: "382416733822",
endpoints.UsEast2RegionID: "404615174143",
endpoints.UsGovWest1RegionID: "226302683700",
endpoints.UsWest1RegionID: "632365934929",
endpoints.UsWest2RegionID: "174872318107",
// endpoints.MeCentral1RegionID: "",
endpoints.MeSouth1RegionID: "249704162688",
endpoints.SaEast1RegionID: "855470959533",
endpoints.UsEast1RegionID: "382416733822",
endpoints.UsEast2RegionID: "404615174143",
endpoints.UsGovWest1RegionID: "226302683700",
endpoints.UsWest1RegionID: "632365934929",
endpoints.UsWest2RegionID: "174872318107",
}

// https://docs.aws.amazon.com/sagemaker/latest/dg/sagemaker-algo-docker-registry-paths.html
Expand Down Expand Up @@ -205,13 +208,14 @@ var prebuiltECRImageIDByRegion_xgBoost = map[string]string{
endpoints.EuWest1RegionID: "141502667606",
endpoints.EuWest2RegionID: "764974769150",
endpoints.EuWest3RegionID: "659782779980",
endpoints.MeSouth1RegionID: "801668240914",
endpoints.SaEast1RegionID: "737474898029",
endpoints.UsEast1RegionID: "683313688378",
endpoints.UsEast2RegionID: "257758044811",
endpoints.UsGovWest1RegionID: "414596584902",
endpoints.UsWest1RegionID: "746614075791",
endpoints.UsWest2RegionID: "246618743249",
// endpoints.MeCentral1RegionID: "",
endpoints.MeSouth1RegionID: "801668240914",
endpoints.SaEast1RegionID: "737474898029",
endpoints.UsEast1RegionID: "683313688378",
endpoints.UsEast2RegionID: "257758044811",
endpoints.UsGovWest1RegionID: "414596584902",
endpoints.UsWest1RegionID: "746614075791",
endpoints.UsWest2RegionID: "246618743249",
}

// https://docs.aws.amazon.com/sagemaker/latest/dg/sagemaker-algo-docker-registry-paths.html
Expand All @@ -234,13 +238,14 @@ var PrebuiltECRImageIDByRegion_sparkML = map[string]string{
endpoints.EuWest1RegionID: "141502667606",
endpoints.EuWest2RegionID: "764974769150",
endpoints.EuWest3RegionID: "659782779980",
endpoints.MeSouth1RegionID: "801668240914",
endpoints.SaEast1RegionID: "737474898029",
endpoints.UsEast1RegionID: "683313688378",
endpoints.UsEast2RegionID: "257758044811",
endpoints.UsGovWest1RegionID: "414596584902",
endpoints.UsWest1RegionID: "746614075791",
endpoints.UsWest2RegionID: "246618743249",
// endpoints.MeCentral1RegionID: "",
endpoints.MeSouth1RegionID: "801668240914",
endpoints.SaEast1RegionID: "737474898029",
endpoints.UsEast1RegionID: "683313688378",
endpoints.UsEast2RegionID: "257758044811",
endpoints.UsGovWest1RegionID: "414596584902",
endpoints.UsWest1RegionID: "746614075791",
endpoints.UsWest2RegionID: "246618743249",
}

// https://github.com/aws/deep-learning-containers/blob/master/available_images.md
Expand All @@ -261,13 +266,14 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{
endpoints.EuWest1RegionID: "763104351884",
endpoints.EuWest2RegionID: "763104351884",
endpoints.EuWest3RegionID: "763104351884",
endpoints.MeSouth1RegionID: "217643126080",
endpoints.SaEast1RegionID: "763104351884",
endpoints.UsEast1RegionID: "763104351884",
endpoints.UsEast2RegionID: "763104351884",
endpoints.UsIsoEast1RegionID: "886529160074",
endpoints.UsWest1RegionID: "763104351884",
endpoints.UsWest2RegionID: "763104351884",
// endpoints.MeCentral1RegionID: "",
endpoints.MeSouth1RegionID: "217643126080",
endpoints.SaEast1RegionID: "763104351884",
endpoints.UsEast1RegionID: "763104351884",
endpoints.UsEast2RegionID: "763104351884",
endpoints.UsIsoEast1RegionID: "886529160074",
endpoints.UsWest1RegionID: "763104351884",
endpoints.UsWest2RegionID: "763104351884",
}

// https://github.com/aws/sagemaker-tensorflow-serving-container
Expand All @@ -287,12 +293,13 @@ var prebuiltECRImageIDByRegion_tensorFlowServing = map[string]string{
endpoints.EuWest1RegionID: "520713654638",
endpoints.EuWest2RegionID: "520713654638",
endpoints.EuWest3RegionID: "520713654638",
endpoints.MeSouth1RegionID: "724002660598",
endpoints.SaEast1RegionID: "520713654638",
endpoints.UsEast1RegionID: "520713654638",
endpoints.UsEast2RegionID: "520713654638",
endpoints.UsWest1RegionID: "520713654638",
endpoints.UsWest2RegionID: "520713654638",
// endpoints.MeCentral1RegionID: "",
endpoints.MeSouth1RegionID: "724002660598",
endpoints.SaEast1RegionID: "520713654638",
endpoints.UsEast1RegionID: "520713654638",
endpoints.UsEast2RegionID: "520713654638",
endpoints.UsWest1RegionID: "520713654638",
endpoints.UsWest2RegionID: "520713654638",
}

func DataSourcePrebuiltECRImage() *schema.Resource {
Expand Down