From e506258ff6089caccf93af0ba269d579483714a3 Mon Sep 17 00:00:00 2001 From: amavrogiannis Date: Fri, 29 Mar 2024 14:16:29 +0000 Subject: [PATCH 1/3] reformatting terraform --- .github/workflows/terraform_prod.yaml | 2 +- .github/workflows/terraform_test.yaml | 2 +- infra/envs/prod/modules.tf | 3 --- infra/envs/test/modules.tf | 3 --- infra/modules/web/cloudfront.tf | 2 -- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/terraform_prod.yaml b/.github/workflows/terraform_prod.yaml index 029c45e..5bb870b 100644 --- a/.github/workflows/terraform_prod.yaml +++ b/.github/workflows/terraform_prod.yaml @@ -24,7 +24,7 @@ env: jobs: terraform: - name: "Terraform Infrastructure Change Management" + name: "Development - Terraform Infrastructure" runs-on: ubuntu-latest defaults: run: diff --git a/.github/workflows/terraform_test.yaml b/.github/workflows/terraform_test.yaml index c37a6e9..90bad8f 100644 --- a/.github/workflows/terraform_test.yaml +++ b/.github/workflows/terraform_test.yaml @@ -24,7 +24,7 @@ env: jobs: terraform: - name: "Terraform Infrastructure Change Management" + name: "Development - Terraform Infrastructure" runs-on: ubuntu-latest defaults: run: diff --git a/infra/envs/prod/modules.tf b/infra/envs/prod/modules.tf index f6b0c60..d4b5261 100644 --- a/infra/envs/prod/modules.tf +++ b/infra/envs/prod/modules.tf @@ -9,7 +9,4 @@ module "cvalexmav_web" { service_group = "CV_Website" environment = "Production" - providers = { - aws.virginia = aws.virginia - } } \ No newline at end of file diff --git a/infra/envs/test/modules.tf b/infra/envs/test/modules.tf index 5dbbd90..09e468d 100644 --- a/infra/envs/test/modules.tf +++ b/infra/envs/test/modules.tf @@ -9,7 +9,4 @@ module "testalexmav_web" { service_group = "Test_Website" environment = "Development" - providers = { - aws.virginia = aws.virginia - } } \ No newline at end of file diff --git a/infra/modules/web/cloudfront.tf b/infra/modules/web/cloudfront.tf index 493f5f5..917aee5 100644 --- a/infra/modules/web/cloudfront.tf +++ b/infra/modules/web/cloudfront.tf @@ -1,7 +1,5 @@ data "aws_acm_certificate" "this" { domain = "alexmav.co.uk" - - provider = aws.virginia } resource "aws_cloudfront_origin_access_identity" "this" { From e4329370b5fab5d290593a09fbf1fc10c9818aac Mon Sep 17 00:00:00 2001 From: amavrogiannis Date: Fri, 29 Mar 2024 14:20:44 +0000 Subject: [PATCH 2/3] fetching accurate acm --- infra/envs/prod/modules.tf | 2 ++ infra/envs/test/modules.tf | 2 ++ infra/modules/web/cloudfront.tf | 2 +- infra/modules/web/variables.tf | 6 ++++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/infra/envs/prod/modules.tf b/infra/envs/prod/modules.tf index d4b5261..733a1f3 100644 --- a/infra/envs/prod/modules.tf +++ b/infra/envs/prod/modules.tf @@ -5,6 +5,8 @@ module "cvalexmav_web" { enable_website = true + domain_acm = "cv.alexmav.co.uk" + # Tags service_group = "CV_Website" environment = "Production" diff --git a/infra/envs/test/modules.tf b/infra/envs/test/modules.tf index 09e468d..ca9fa52 100644 --- a/infra/envs/test/modules.tf +++ b/infra/envs/test/modules.tf @@ -5,6 +5,8 @@ module "testalexmav_web" { enable_website = true + domain_acm = "cv.alexmav.co.uk" + # Tags service_group = "Test_Website" environment = "Development" diff --git a/infra/modules/web/cloudfront.tf b/infra/modules/web/cloudfront.tf index 917aee5..1869b64 100644 --- a/infra/modules/web/cloudfront.tf +++ b/infra/modules/web/cloudfront.tf @@ -1,5 +1,5 @@ data "aws_acm_certificate" "this" { - domain = "alexmav.co.uk" + domain = var.domain_acm } resource "aws_cloudfront_origin_access_identity" "this" { diff --git a/infra/modules/web/variables.tf b/infra/modules/web/variables.tf index f1b4b03..3e0331c 100644 --- a/infra/modules/web/variables.tf +++ b/infra/modules/web/variables.tf @@ -30,3 +30,9 @@ variable "enable_website" { description = "Define the resource_group tag" type = bool } + +// Domain +variable "domain_acm" { + description = "Provide the domain name to fetch ACM" + type = string +} \ No newline at end of file From 726d7f450e4ac34701577f115fe0cd70149fff6e Mon Sep 17 00:00:00 2001 From: amavrogiannis Date: Fri, 29 Mar 2024 14:23:06 +0000 Subject: [PATCH 3/3] making compression shorter --- infra/modules/web/cloudfront.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/modules/web/cloudfront.tf b/infra/modules/web/cloudfront.tf index 1869b64..cc91e7a 100644 --- a/infra/modules/web/cloudfront.tf +++ b/infra/modules/web/cloudfront.tf @@ -80,7 +80,7 @@ resource "aws_cloudfront_distribution" "this" { min_ttl = 0 default_ttl = 3600 - max_ttl = 86400 + max_ttl = 7200 compress = true viewer_protocol_policy = "redirect-to-https" }