File tree Expand file tree Collapse file tree 3 files changed +13
-25
lines changed Expand file tree Collapse file tree 3 files changed +13
-25
lines changed Original file line number Diff line number Diff line change @@ -59,18 +59,3 @@ resource "aws_lb_target_group" "app" {
59
59
60
60
tags = module. common . common_tags
61
61
}
62
- resource "aws_cloudfront_vpc_origin" "alb" {
63
- vpc_origin_endpoint_config {
64
- name = var. app_name
65
- arn = aws_lb. app-alb . arn
66
- http_port = 80
67
- https_port = 443
68
- origin_protocol_policy = " https-only"
69
-
70
- origin_ssl_protocols {
71
- items = [" TLSv1.2" ]
72
- quantity = 1
73
- }
74
- }
75
- tags = module. common . common_tags
76
- }
Original file line number Diff line number Diff line change @@ -45,14 +45,15 @@ module "cloudfront_api" {
45
45
distribution_type = " alb" # Using ALB as the origin
46
46
enabled = true
47
47
48
- # API Origin Configuration
49
- # api_origin_domain_name = "${module.api_gateway.api_id}.execute-api.${var.aws_region}.amazonaws.com"
50
- # api_origin_id = "http-api-origin"
51
- # api_origin_protocol_policy = "https-only"
52
- # api_origin_ssl_protocols = ["TLSv1.2"]
48
+ # ALB Origin Configuration
53
49
alb_origin_domain_name = aws_lb. app-alb . dns_name
54
50
alb_origin_id = " api-alb-origin"
55
- alb_vpc_origin_id = aws_cloudfront_vpc_origin. alb . id
51
+
52
+ # Use API origin settings for ALB (since we're using custom_origin_config)
53
+ api_origin_protocol_policy = " http-only"
54
+ api_origin_http_port = 80
55
+ api_origin_https_port = 443
56
+ api_origin_ssl_protocols = [" TLSv1.2" ]
56
57
# WAF Integration
57
58
web_acl_arn = module. waf_api [0 ]. web_acl_arn
58
59
Original file line number Diff line number Diff line change @@ -52,12 +52,14 @@ resource "aws_cloudfront_distribution" "this" {
52
52
content {
53
53
domain_name = var. alb_origin_domain_name
54
54
origin_id = var. alb_origin_id
55
- vpc_origin_config {
56
- vpc_origin_id = var. alb_vpc_origin_id
55
+
56
+ custom_origin_config {
57
+ origin_protocol_policy = var. api_origin_protocol_policy # Reuse API origin settings
58
+ http_port = var. api_origin_http_port
59
+ https_port = var. api_origin_https_port
60
+ origin_ssl_protocols = var. api_origin_ssl_protocols
57
61
}
58
62
}
59
-
60
-
61
63
}
62
64
63
65
You can’t perform that action at this time.
0 commit comments