Skip to content

Commit bca6961

Browse files
committed
chore: fix "name" deprecation for aws_region data source
This fixes the deprecation of the "name" attribute for the aws_region data source, adding a fallback for provider versions < 6.0.0.
1 parent 0710df3 commit bca6961

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

main.tf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ locals {
8585
]
8686
}
8787

88+
# The "region" attribute was only added in the AWS provider version 6.0.0, so we fall back to name for older versions.
89+
# This can be removed once the minimum required AWS provider version is 6.0.0 or newer
90+
aws_region_name = try(data.aws_region.current[0].region, data.aws_region.current[0].name)
91+
8892
# Based on https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/origin-shield.html#choose-origin-shield-region
8993
# If a region is not specified, we assume it supports Origin Shield.
9094
origin_shield_region_fallback_map = {
@@ -97,7 +101,7 @@ locals {
97101
"eu-north-1" = "eu-west-2"
98102
"me-south-1" = "ap-south-1"
99103
}
100-
origin_shield_region = local.enabled ? lookup(local.origin_shield_region_fallback_map, data.aws_region.current[0].name, data.aws_region.current[0].name) : "this string is never used"
104+
origin_shield_region = local.enabled ? lookup(local.origin_shield_region_fallback_map, local.aws_region_name, local.aws_region_name) : "this string is never used"
101105

102106
cors_origins = distinct(compact(concat(var.cors_allowed_origins, var.aliases, var.external_aliases)))
103107
}

0 commit comments

Comments
 (0)