Skip to content

feat(variables): Add variable types to default_origin, cache_behavior, ordered_cache_behavior. #167

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.

Sign up for GitHub

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

feat(variables): Add variable types to default_origin, cache_behavior, ordered_cache_behavior. #167

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cc4d9c6
feat: make origin a typed variable
kevcube Jul 31, 2025
48e3f69
fix vpc_origin
kevcube Jul 31, 2025
29293d5
pre-commit
kevcube Jul 31, 2025
ab10f58
fix custom header default
kevcube Jul 31, 2025
db81072
feat: complex variable type for default cache behavior
kevcube Jul 31, 2025
041f17f
feat: complex type for ordered_cache_behavior
kevcube Jul 31, 2025
e2da7ac
fix handling default nulls in data objects
kevcube Jul 31, 2025
3efaaa2
Merge branch 'master' into complex_vars
kevcube Oct 27, 2025
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
48 changes: 25 additions & 23 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,59 +81,61 @@ resource "aws_cloudfront_distribution" "this" {
for_each = var.origin

content {
domain_name = origin.value.domain_name
origin_id = lookup(origin.value, "origin_id", origin.key)
origin_path = lookup(origin.value, "origin_path", "")
connection_attempts = lookup(origin.value, "connection_attempts", null)
connection_timeout = lookup(origin.value, "connection_timeout", null)
origin_access_control_id = lookup(origin.value, "origin_access_control_id", lookup(lookup(aws_cloudfront_origin_access_control.this, lookup(origin.value, "origin_access_control", ""), {}), "id", null))

dynamic "s3_origin_config" {
for_each = length(keys(lookup(origin.value, "s3_origin_config", {}))) == 0 ? [] : [lookup(origin.value, "s3_origin_config", {})]

content {
origin_access_identity = lookup(s3_origin_config.value, "cloudfront_access_identity_path", lookup(lookup(aws_cloudfront_origin_access_identity.this, lookup(s3_origin_config.value, "origin_access_identity", ""), {}), "cloudfront_access_identity_path", null))
Comment on lines -84 to -95
Copy link
Author

@kevcube kevcube Jul 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all origin params have been re-ordered to match provider documentation and remove opinionation.

}
}
connection_attempts = origin.value.connection_attempts
connection_timeout = origin.value.connection_timeout

dynamic "custom_origin_config" {
for_each = length(lookup(origin.value, "custom_origin_config", "")) == 0 ? [] : [lookup(origin.value, "custom_origin_config", "")]
for_each = origin.value.custom_origin_config != null ? [origin.value.custom_origin_config] : []

content {
http_port = custom_origin_config.value.http_port
https_port = custom_origin_config.value.https_port
origin_protocol_policy = custom_origin_config.value.origin_protocol_policy
origin_ssl_protocols = custom_origin_config.value.origin_ssl_protocols
origin_keepalive_timeout = lookup(custom_origin_config.value, "origin_keepalive_timeout", null)
origin_read_timeout = lookup(custom_origin_config.value, "origin_read_timeout", null)
origin_keepalive_timeout = custom_origin_config.value.origin_keepalive_timeout
origin_read_timeout = custom_origin_config.value.origin_read_timeout
}
}

domain_name = origin.value.domain_name

dynamic "custom_header" {
for_each = lookup(origin.value, "custom_header", [])
for_each = origin.value.custom_header

content {
name = custom_header.value.name
value = custom_header.value.value
}
}

origin_access_control_id = origin.value.origin_access_control_id
origin_id = coalesce(origin.value.origin_id, origin.key)
origin_path = origin.value.origin_path

dynamic "origin_shield" {
for_each = length(keys(lookup(origin.value, "origin_shield", {}))) == 0 ? [] : [lookup(origin.value, "origin_shield", {})]
for_each = origin.value.origin_shield != null ? [origin.value.origin_shield] : []

content {
enabled = origin_shield.value.enabled
origin_shield_region = origin_shield.value.origin_shield_region
}
}

dynamic "s3_origin_config" {
for_each = origin.value.s3_origin_config != null ? [origin.value.s3_origin_config] : []

content {
origin_access_identity = s3_origin_config.value.origin_access_identity
}
}

dynamic "vpc_origin_config" {
for_each = length(keys(lookup(origin.value, "vpc_origin_config", {}))) == 0 ? [] : [lookup(origin.value, "vpc_origin_config", {})]
for_each = origin.value.vpc_origin_config != null ? [origin.value.vpc_origin_config] : []

content {
vpc_origin_id = lookup(vpc_origin_config.value, "vpc_origin_id", lookup(lookup(aws_cloudfront_vpc_origin.this, lookup(vpc_origin_config.value, "vpc_origin", ""), {}), "id", null))
origin_keepalive_timeout = lookup(vpc_origin_config.value, "origin_keepalive_timeout", null)
origin_read_timeout = lookup(vpc_origin_config.value, "origin_read_timeout", null)
vpc_origin_id = coalesce(vpc_origin_config.value.vpc_origin_id, aws_cloudfront_vpc_origin.this[origin.key].id)
origin_keepalive_timeout = vpc_origin_config.value.origin_keepalive_timeout
origin_read_timeout = vpc_origin_config.value.origin_read_timeout
}
}
}
Expand Down
35 changes: 33 additions & 2 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,39 @@ variable "tags" {

variable "origin" {
description = "One or more origins for this distribution (multiples allowed)."
type = any
default = null
type = map(object({
connection_attempts = optional(number)
connection_timeout = optional(number)
custom_origin_config = optional(object({
http_port = number
https_port = number
origin_protocol_policy = string
origin_ssl_protocols = list(string)
origin_keepalive_timeout = optional(number)
origin_read_timeout = optional(number)
}))
domain_name = string
custom_header = optional(list(object({
name = string
value = string
})))
origin_access_control_id = optional(string)
origin_id = optional(string) # If not provided, map key is used.
origin_path = optional(string)
origin_shield = optional(object({
enabled = bool
origin_shield_region = optional(string)
}))
s3_origin_config = optional(object({
origin_access_identity = string
}))
vpc_origin_config = optional(object({
origin_keepalive_timeout = optional(number)
origin_read_timeout = optional(number)
vpc_origin_id = optional(string) # If not provided, uses aws_cloudfront_vpc_origin.this
}))
}))
default = null
}

variable "origin_group" {
Expand Down
Loading