diff --git a/terraform/monitoring/ingest_inspector/certificate.tf b/terraform/monitoring/ingest_inspector/certificate.tf index fadce5247..a9fdbae62 100644 --- a/terraform/monitoring/ingest_inspector/certificate.tf +++ b/terraform/monitoring/ingest_inspector/certificate.tf @@ -1,6 +1,6 @@ # The ACM certificate must be created in the us-east-1 region to work with CloudFront resource "aws_acm_certificate" "ingest_inspector_certificate" { - provider = aws.us-east-1 + provider = aws.us-east-1 domain_name = var.domain_name validation_method = "DNS" @@ -30,7 +30,7 @@ resource "aws_route53_record" "cert_validation" { } resource "aws_acm_certificate_validation" "validation" { - provider = aws.us-east-1 - certificate_arn = aws_acm_certificate.ingest_inspector_certificate.arn + provider = aws.us-east-1 + certificate_arn = aws_acm_certificate.ingest_inspector_certificate.arn validation_record_fqdns = [for record in aws_route53_record.cert_validation : record.fqdn] } diff --git a/terraform/monitoring/ingest_inspector/dns.tf b/terraform/monitoring/ingest_inspector/dns.tf index 4b9091321..2b8a2f6fc 100644 --- a/terraform/monitoring/ingest_inspector/dns.tf +++ b/terraform/monitoring/ingest_inspector/dns.tf @@ -1,9 +1,9 @@ # Add an A record to the wellcomecollection.org hosted zone resource "aws_route53_record" "cdn" { provider = aws.dns - zone_id = data.aws_route53_zone.weco_zone.id - name = var.domain_name - type = "A" + zone_id = data.aws_route53_zone.weco_zone.id + name = var.domain_name + type = "A" alias { name = aws_cloudfront_distribution.ingest_inspector_cloudfront_distribution.domain_name diff --git a/terraform/monitoring/ingest_inspector/lambda_backend.tf b/terraform/monitoring/ingest_inspector/lambda_backend.tf index 4c3b3f22a..3a2739b98 100644 --- a/terraform/monitoring/ingest_inspector/lambda_backend.tf +++ b/terraform/monitoring/ingest_inspector/lambda_backend.tf @@ -21,8 +21,8 @@ module "ingest_inspector_lambda" { environment = { variables = { # The wellcome_storage_service Python package will not successfully import unless there is a HOME environment variable - "HOME" = "dummy_value" - "COGNITO_CLIENT_ID_SECRET_NAME" = aws_secretsmanager_secret.ingest_inspector_cognito_client_id.name + "HOME" = "dummy_value" + "COGNITO_CLIENT_ID_SECRET_NAME" = aws_secretsmanager_secret.ingest_inspector_cognito_client_id.name "COGNITO_CLIENT_SECRET_SECRET_NAME" = aws_secretsmanager_secret.ingest_inspector_cognito_client_secret.name } } diff --git a/terraform/monitoring/ingest_inspector/provider.tf b/terraform/monitoring/ingest_inspector/provider.tf index dfba4cd8b..ba87b50a4 100644 --- a/terraform/monitoring/ingest_inspector/provider.tf +++ b/terraform/monitoring/ingest_inspector/provider.tf @@ -13,5 +13,5 @@ provider "aws" { } region = "us-east-1" - alias = "us-east-1" + alias = "us-east-1" } diff --git a/terraform/monitoring/ingest_inspector/s3_cloudfront_frontend.tf b/terraform/monitoring/ingest_inspector/s3_cloudfront_frontend.tf index a21a08122..575d088c8 100644 --- a/terraform/monitoring/ingest_inspector/s3_cloudfront_frontend.tf +++ b/terraform/monitoring/ingest_inspector/s3_cloudfront_frontend.tf @@ -45,8 +45,8 @@ resource "aws_cloudfront_distribution" "ingest_inspector_cloudfront_distribution } viewer_certificate { - acm_certificate_arn = aws_acm_certificate.ingest_inspector_certificate.arn - ssl_support_method = "sni-only" + acm_certificate_arn = aws_acm_certificate.ingest_inspector_certificate.arn + ssl_support_method = "sni-only" minimum_protocol_version = "TLSv1.2_2021" }