Skip to content

Commit 48e3f69

Browse files
committed
fix vpc_origin
1 parent cc4d9c6 commit 48e3f69

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ resource "aws_cloudfront_distribution" "this" {
133133
for_each = origin.value.vpc_origin_config != null ? [origin.value.vpc_origin_config] : []
134134

135135
content {
136-
vpc_origin_id = coalesce(vpc_origin_config.value.vpc_origin_id, aws_cloudfront_vpc_origin.this[origin.key].id)
136+
vpc_origin_id = coalesce(vpc_origin_config.value.vpc_origin_id,
137+
aws_cloudfront_vpc_origin.this[vpc_origin_config.value.vpc_origin].id)
137138
origin_keepalive_timeout = vpc_origin_config.value.origin_keepalive_timeout
138139
origin_read_timeout = vpc_origin_config.value.origin_read_timeout
139140
}

variables.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,11 @@ variable "origin" {
151151
vpc_origin_config = optional(object({
152152
origin_keepalive_timeout = optional(number)
153153
origin_read_timeout = optional(number)
154-
vpc_origin_id = optional(string) # If not provided, uses aws_cloudfront_vpc_origin.this
154+
vpc_origin_id = optional(string) # If not provided, uses aws_cloudfront_vpc_origin.this[this.vpc_origin].id
155+
vpc_origin = optional(string) # Custom parameter to lookup against aws_cloudfront_vpc_origin.this
155156
}))
156157
}))
157-
default = null
158+
default = {}
158159
}
159160

160161
variable "origin_group" {

0 commit comments

Comments
 (0)