Skip to content

Optimised adding content to s3 bucket #1

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

Merged
merged 3 commits into from
Aug 8, 2022
Merged

Optimised adding content to s3 bucket #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a1adf8
Optimised adding content to S3 bucket, added mime_types map
mikmorley Aug 8, 2022
4be221e
Added additional error handling to CloudFront for 404
mikmorley Aug 8, 2022
1d7cc38
Updated view certificate options on CloudFront
mikmorley Aug 8, 2022
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
54 changes: 33 additions & 21 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@ locals {
# If var.s3_bucket_name is not set, a new bucket will be created.
create_bucket = var.s3_bucket_name == "" ? 1 : 0
bucket_name = local.create_bucket == 1 ? "${var.name}-${local.account_id}" : var.s3_bucket_name

mime_types = {
html = "text/html",
css = "text/css",
eot = "application/vnd.ms-fontobject",
svg = "image/svg+xml",
ttf = "application/octet-stream",
woff = "font/woff",
woff2 = "font/woff2",
otf = "font/otf",
jpg = "image/jpeg",
png = "image/png",
js = "text/javascript"
}
}

# Create S3 Bucket
Expand Down Expand Up @@ -55,26 +69,15 @@ resource "aws_s3_bucket_public_access_block" "website" {
}

# Add initial static web files to s3 for validation of infrastructure
resource "aws_s3_bucket_object" "index" {
depends_on = [
aws_s3_bucket.website[0]
]
bucket = aws_s3_bucket.website[0].bucket
key = "index.html"
source = "${path.module}/files/index.html"
content_type = "text/html"
etag = filemd5("${path.module}/files/index.html")
}
resource "aws_s3_bucket_object" "root" {
for_each = fileset("${path.module}/files/", "**")

resource "aws_s3_bucket_object" "error" {
depends_on = [
aws_s3_bucket.website[0]
]
bucket = aws_s3_bucket.website[0].bucket
key = "error.html"
source = "${path.module}/files/error.html"
content_type = "text/html"
etag = filemd5("${path.module}/files/error.html")
bucket = local.mikmorley_com_s3_bucket
key = each.value
source = "${path.module}/files/${each.value}"
etag = filemd5("${path.module}/files/${each.value}")

content_type = lookup(local.mime_types, split(".", each.value)[length(split(".", each.value)) - 1], "application/octet-stream")
}

# CloudFront Distribution
Expand Down Expand Up @@ -125,7 +128,7 @@ resource "aws_cloudfront_distribution" "s3_distribution" {
max_ttl = 31536000
}

price_class = "PriceClass_100"
price_class = "PriceClass_All"

restrictions {
geo_restriction {
Expand All @@ -134,8 +137,10 @@ resource "aws_cloudfront_distribution" "s3_distribution" {
}

viewer_certificate {
cloudfront_default_certificate = true
cloudfront_default_certificate = false
acm_certificate_arn = var.cloudfront_certificate_arn
ssl_support_method = "sni-only"
minimum_protocol_version = "TLSv1.2_2021"
}

custom_error_response {
Expand All @@ -145,6 +150,13 @@ resource "aws_cloudfront_distribution" "s3_distribution" {
response_page_path = "/error.html"
}

custom_error_response {
error_code = 404
response_code = 200
error_caching_min_ttl = 0
response_page_path = "/error.html"
}

wait_for_deployment = false

tags = {
Expand Down
2 changes: 1 addition & 1 deletion providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ terraform {
}

provider "aws" {
region = var.region
region = var.region
}