diff --git a/infra/terraform/accounts/nonprod/.terraform.lock.hcl b/infra/terraform/accounts/nonprod/.terraform.lock.hcl index 3933069ad9..43f7b57ca5 100644 --- a/infra/terraform/accounts/nonprod/.terraform.lock.hcl +++ b/infra/terraform/accounts/nonprod/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.39.1" - constraints = ">= 4.0.0, >= 5.0.0, >= 5.6.0, >= 5.21.0, >= 5.27.0, ~> 5.39.0" + version = "5.49.0" + constraints = ">= 4.0.0, >= 4.22.0, >= 5.0.0, >= 5.6.0, >= 5.21.0, >= 5.27.0, ~> 5.49.0" hashes = [ - "h1:V29aKJqUWugn9F2pBIaWLwHLTmgFpirKEv1aNRX1kV4=", - "zh:05c50a5d8edb3ba4ebc4eb6e0d0b5e319142f5983b27821710ed7d475d335bdc", - "zh:082986a5784dd21957e632371b289e549f051a4ea21d5c78c6d744c3537f03c5", - "zh:192ae622ba562eacc4921ed549a794506179233d724fdd15a4f147f3400724a0", - "zh:19a1d4637a62de90b0da174c0bf01000cd900488f7e8f709d8a37f082c59756b", - "zh:1d7689a8583515f1705972d7ce57ccfab96215b19905530d2c78c02dcfaff583", - "zh:22c446a21209a52ab74b4ba1ede0b220531e97ce479430047e493a2c45e1d8cb", - "zh:4154de82290ab4e9f81bac1ea62342de8b3b7a608f99258c190d4dd1c6663e47", - "zh:6bc4859ccdc54f28af9286b2fa090a31dcb345138d68c471510b737f6a052011", - "zh:73c69e000e0b321e78a4a12fef60d37285f2afec0ea7be9e06163d985101cb59", - "zh:890a3422f5e445b49bae30facf448d0ec9cd647e9155d0b685b5b39e9d331a94", + "h1:RZtXnBRpO4LNmmz0tXJQLa2heqk9VFGblFZtRCZkm/M=", + "zh:0979b07cdeffb868ea605e4bbc008adc7cccb5f3ba1d3a0b794ea3e8fff20932", + "zh:2121a0a048a1d9419df69f3561e524b7e8a6b74ba0f57bd8948799f12b6ad3a1", + "zh:573362042ba0bd18e98567a4f45d91b09eb0d223513518ba04f16a646a906403", + "zh:57be7a4d6c362be2fa586d270203f4eac1ee239816239a9503b86ebc8fa1fef0", + "zh:5c72ed211d9234edd70eac9d77c3cafc7bbf819d1c28332a6d77acf227c9a23c", + "zh:7786d1a9781f8e8c0079bf58f4ed4aeddec0caf54ad7ddcf43c47936d545a04f", + "zh:82133e7d39787ee91ed41988da71beecc2ecb900b5da94b3f3d77fbc4d4dc722", + "zh:8cdb1c154dead85be8352afd30eaf41c59249de9e7e0a8eb4ab8e625b90a4922", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9cd88bec0f5205df9032e3126d4e57edd1c5cc8d45cda25626882dafc485a3b0", - "zh:a3a8e3276d0fbf051bbafa192a2998b05745f2cf285ac8c36a9ad167a75c037f", - "zh:d47e4dcf4c0ad71b9a7c720be4f3a89f6786a82e77bbe8d950794562792a1da5", - "zh:f74e5b2af508c7de80a6ae5198df54a795eeba5058a0cd247828943f0c54f6e0", + "zh:ac215fd1c3bd647ae38868940651b97a53197688daefcd70b3595c84560e5267", + "zh:c45db22356d20e431639061a72e07da5201f4937c1df6b9f03f32019facf3905", + "zh:c9ba90e62db9a4708ed1a4e094849f88ce9d44c52b49f613b30bb3f7523b8d97", + "zh:d2be3607be2209995c80dc1d66086d527de5d470f73509e813254067e8287106", + "zh:e3fa20090f3cebf3911fc7ef122bd8c0505e3330ab7d541fa945fea861205007", + "zh:ef1b9d5c0b6279323f2ecfc322db8083e141984cfe1bb2f33c0f4934fccb69e3", ] } diff --git a/infra/terraform/accounts/nonprod/provider.tf b/infra/terraform/accounts/nonprod/provider.tf index ab1d382863..319e3a52cf 100644 --- a/infra/terraform/accounts/nonprod/provider.tf +++ b/infra/terraform/accounts/nonprod/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.39.0" + version = "~> 5.49.0" } } diff --git a/infra/terraform/accounts/prod/provider.tf b/infra/terraform/accounts/prod/provider.tf index 90d5b1db62..60496863dc 100644 --- a/infra/terraform/accounts/prod/provider.tf +++ b/infra/terraform/accounts/prod/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.39.0" + version = "~> 5.49.0" } } diff --git a/infra/terraform/environments/dev/.terraform.lock.hcl b/infra/terraform/environments/dev/.terraform.lock.hcl index 6143c828c7..e4f90df314 100644 --- a/infra/terraform/environments/dev/.terraform.lock.hcl +++ b/infra/terraform/environments/dev/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.39.1" - constraints = "~> 5.39.0" + version = "5.49.0" + constraints = ">= 2.49.0, >= 4.40.0, >= 4.66.1, >= 5.0.0, >= 5.12.0, >= 5.27.0, ~> 5.49.0" hashes = [ - "h1:V29aKJqUWugn9F2pBIaWLwHLTmgFpirKEv1aNRX1kV4=", - "zh:05c50a5d8edb3ba4ebc4eb6e0d0b5e319142f5983b27821710ed7d475d335bdc", - "zh:082986a5784dd21957e632371b289e549f051a4ea21d5c78c6d744c3537f03c5", - "zh:192ae622ba562eacc4921ed549a794506179233d724fdd15a4f147f3400724a0", - "zh:19a1d4637a62de90b0da174c0bf01000cd900488f7e8f709d8a37f082c59756b", - "zh:1d7689a8583515f1705972d7ce57ccfab96215b19905530d2c78c02dcfaff583", - "zh:22c446a21209a52ab74b4ba1ede0b220531e97ce479430047e493a2c45e1d8cb", - "zh:4154de82290ab4e9f81bac1ea62342de8b3b7a608f99258c190d4dd1c6663e47", - "zh:6bc4859ccdc54f28af9286b2fa090a31dcb345138d68c471510b737f6a052011", - "zh:73c69e000e0b321e78a4a12fef60d37285f2afec0ea7be9e06163d985101cb59", - "zh:890a3422f5e445b49bae30facf448d0ec9cd647e9155d0b685b5b39e9d331a94", + "h1:RZtXnBRpO4LNmmz0tXJQLa2heqk9VFGblFZtRCZkm/M=", + "zh:0979b07cdeffb868ea605e4bbc008adc7cccb5f3ba1d3a0b794ea3e8fff20932", + "zh:2121a0a048a1d9419df69f3561e524b7e8a6b74ba0f57bd8948799f12b6ad3a1", + "zh:573362042ba0bd18e98567a4f45d91b09eb0d223513518ba04f16a646a906403", + "zh:57be7a4d6c362be2fa586d270203f4eac1ee239816239a9503b86ebc8fa1fef0", + "zh:5c72ed211d9234edd70eac9d77c3cafc7bbf819d1c28332a6d77acf227c9a23c", + "zh:7786d1a9781f8e8c0079bf58f4ed4aeddec0caf54ad7ddcf43c47936d545a04f", + "zh:82133e7d39787ee91ed41988da71beecc2ecb900b5da94b3f3d77fbc4d4dc722", + "zh:8cdb1c154dead85be8352afd30eaf41c59249de9e7e0a8eb4ab8e625b90a4922", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9cd88bec0f5205df9032e3126d4e57edd1c5cc8d45cda25626882dafc485a3b0", - "zh:a3a8e3276d0fbf051bbafa192a2998b05745f2cf285ac8c36a9ad167a75c037f", - "zh:d47e4dcf4c0ad71b9a7c720be4f3a89f6786a82e77bbe8d950794562792a1da5", - "zh:f74e5b2af508c7de80a6ae5198df54a795eeba5058a0cd247828943f0c54f6e0", + "zh:ac215fd1c3bd647ae38868940651b97a53197688daefcd70b3595c84560e5267", + "zh:c45db22356d20e431639061a72e07da5201f4937c1df6b9f03f32019facf3905", + "zh:c9ba90e62db9a4708ed1a4e094849f88ce9d44c52b49f613b30bb3f7523b8d97", + "zh:d2be3607be2209995c80dc1d66086d527de5d470f73509e813254067e8287106", + "zh:e3fa20090f3cebf3911fc7ef122bd8c0505e3330ab7d541fa945fea861205007", + "zh:ef1b9d5c0b6279323f2ecfc322db8083e141984cfe1bb2f33c0f4934fccb69e3", ] } diff --git a/infra/terraform/environments/dev/provider.tf b/infra/terraform/environments/dev/provider.tf index ab1d382863..319e3a52cf 100644 --- a/infra/terraform/environments/dev/provider.tf +++ b/infra/terraform/environments/dev/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.39.0" + version = "~> 5.49.0" } } diff --git a/infra/terraform/environments/int/provider.tf b/infra/terraform/environments/int/provider.tf index ab1d382863..319e3a52cf 100644 --- a/infra/terraform/environments/int/provider.tf +++ b/infra/terraform/environments/int/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.39.0" + version = "~> 5.49.0" } } diff --git a/infra/terraform/environments/prep/provider.tf b/infra/terraform/environments/prep/provider.tf index 90d5b1db62..60496863dc 100644 --- a/infra/terraform/environments/prep/provider.tf +++ b/infra/terraform/environments/prep/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.39.0" + version = "~> 5.49.0" } } diff --git a/infra/terraform/environments/prod/provider.tf b/infra/terraform/environments/prod/provider.tf index 90d5b1db62..60496863dc 100644 --- a/infra/terraform/environments/prod/provider.tf +++ b/infra/terraform/environments/prod/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.39.0" + version = "~> 5.49.0" } } diff --git a/infra/terraform/modules/account/README.md b/infra/terraform/modules/account/README.md index 496cb5cda7..b551bddbfe 100644 --- a/infra/terraform/modules/account/README.md +++ b/infra/terraform/modules/account/README.md @@ -17,7 +17,7 @@ | Name | Source | Version | |------|--------|---------| | [assets](#module\_assets) | terraform-aws-modules/s3-bucket/aws | ~> 4.0 | -| [ecr](#module\_ecr) | terraform-aws-modules/ecr/aws | ~> 1.6 | +| [ecr](#module\_ecr) | terraform-aws-modules/ecr/aws | ~> 2.2 | | [github](#module\_github) | ../../modules/github | n/a | ## Resources diff --git a/infra/terraform/modules/account/ecr.tf b/infra/terraform/modules/account/ecr.tf index 51f4c011c8..6714e1a406 100644 --- a/infra/terraform/modules/account/ecr.tf +++ b/infra/terraform/modules/account/ecr.tf @@ -6,7 +6,7 @@ module "ecr" { for_each = toset(local.repositories) source = "terraform-aws-modules/ecr/aws" - version = "~> 1.6" + version = "~> 2.2" repository_name = "vol-app/${each.key}" @@ -60,14 +60,22 @@ module "ecr" { registry_scan_rules = [ { scan_frequency = "SCAN_ON_PUSH" - filter = "*" - filter_type = "WILDCARD" + filter = [ + { + filter = "*", + filter_type = "WILDCARD" + } + ], }, { scan_frequency = "CONTINUOUS_SCAN" - filter = "*.*.*" - filter_type = "WILDCARD" - } + filter = [ + { + filter = "*.*.*", + filter_type = "WILDCARD" + }, + ], + }, ] } diff --git a/infra/terraform/modules/service/README.md b/infra/terraform/modules/service/README.md index 3ed87f338f..11048e3028 100644 --- a/infra/terraform/modules/service/README.md +++ b/infra/terraform/modules/service/README.md @@ -16,13 +16,13 @@ | Name | Source | Version | |------|--------|---------| -| [acm](#module\_acm) | terraform-aws-modules/acm/aws | ~> 4.0 | +| [acm](#module\_acm) | terraform-aws-modules/acm/aws | ~> 5.0 | | [cloudfront](#module\_cloudfront) | terraform-aws-modules/cloudfront/aws | ~> 3.4 | | [ecs\_cluster](#module\_ecs\_cluster) | terraform-aws-modules/ecs/aws//modules/cluster | ~> 5.10 | | [ecs\_service](#module\_ecs\_service) | terraform-aws-modules/ecs/aws//modules/service | ~> 5.10 | | [log\_bucket](#module\_log\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 4.0 | | [records](#module\_records) | terraform-aws-modules/route53/aws//modules/records | ~> 2.0 | -| [route53\_records](#module\_route53\_records) | terraform-aws-modules/acm/aws | ~> 4.0 | +| [route53\_records](#module\_route53\_records) | terraform-aws-modules/acm/aws | ~> 5.0 | ## Resources diff --git a/infra/terraform/modules/service/cdn.tf b/infra/terraform/modules/service/cdn.tf index 30f09c9f1d..42285011f1 100644 --- a/infra/terraform/modules/service/cdn.tf +++ b/infra/terraform/modules/service/cdn.tf @@ -34,11 +34,13 @@ locals { module "acm" { source = "terraform-aws-modules/acm/aws" - version = "~> 4.0" + version = "~> 5.0" domain_name = "${local.subdomain}.${local.domain_name}" zone_id = data.aws_route53_zone.public.id + validation_method = "DNS" + create_route53_records = false validation_record_fqdns = module.route53_records.validation_route53_record_fqdns @@ -49,7 +51,7 @@ module "acm" { module "route53_records" { source = "terraform-aws-modules/acm/aws" - version = "~> 4.0" + version = "~> 5.0" create_certificate = false create_route53_records_only = true