diff --git a/.github/workflows/deploy-production-container.yml b/.github/workflows/deploy-production-container.yml index ea187b494..dabfb0af5 100644 --- a/.github/workflows/deploy-production-container.yml +++ b/.github/workflows/deploy-production-container.yml @@ -15,7 +15,7 @@ on: env: AWS_REGION: ca-central-1 CONFTEST_VERSION: 0.27.0 - TERRAFORM_VERSION: 1.9.8 + TERRAFORM_VERSION: 1.10.0 TERRAGRUNT_VERSION: 0.57.5 TF_INPUT: false TF_VAR_database_name: ${{ secrets.PRODUCTION_DATABASE_NAME }} diff --git a/.github/workflows/deploy-staging-container.yml b/.github/workflows/deploy-staging-container.yml index f8fb7a773..53ab0c898 100644 --- a/.github/workflows/deploy-staging-container.yml +++ b/.github/workflows/deploy-staging-container.yml @@ -14,7 +14,7 @@ on: env: AWS_REGION: ca-central-1 - TERRAFORM_VERSION: 1.9.8 + TERRAFORM_VERSION: 1.10.0 TERRAGRUNT_VERSION: 0.57.5 TF_INPUT: false TF_VAR_database_name: ${{ secrets.STAGING_DATABASE_NAME }} diff --git a/.github/workflows/terragrunt-apply-production.yml b/.github/workflows/terragrunt-apply-production.yml index d985386aa..ab49a119b 100644 --- a/.github/workflows/terragrunt-apply-production.yml +++ b/.github/workflows/terragrunt-apply-production.yml @@ -10,7 +10,7 @@ on: env: AWS_REGION: ca-central-1 CONFTEST_VERSION: 0.27.0 - TERRAFORM_VERSION: 1.9.8 + TERRAFORM_VERSION: 1.10.0 TERRAGRUNT_VERSION: 0.57.5 TF_INPUT: false TF_VAR_client_vpn_access_group_id: ${{ secrets.PRODUCTION_CLIENT_VPN_ACCESS_GROUP_ID }} diff --git a/.github/workflows/terragrunt-apply-staging.yml b/.github/workflows/terragrunt-apply-staging.yml index 8d08a6e39..c2fb18958 100644 --- a/.github/workflows/terragrunt-apply-staging.yml +++ b/.github/workflows/terragrunt-apply-staging.yml @@ -13,7 +13,7 @@ on: env: AWS_REGION: ca-central-1 - TERRAFORM_VERSION: 1.9.8 + TERRAFORM_VERSION: 1.10.0 TERRAGRUNT_VERSION: 0.57.5 TF_INPUT: false TF_VAR_client_vpn_access_group_id: ${{ secrets.STAGING_CLIENT_VPN_ACCESS_GROUP_ID }} diff --git a/.github/workflows/terragrunt-plan-production.yml b/.github/workflows/terragrunt-plan-production.yml index 62b06b223..2a316ad8c 100644 --- a/.github/workflows/terragrunt-plan-production.yml +++ b/.github/workflows/terragrunt-plan-production.yml @@ -10,7 +10,7 @@ on: env: AWS_REGION: ca-central-1 CONFTEST_VERSION: 0.27.0 - TERRAFORM_VERSION: 1.9.8 + TERRAFORM_VERSION: 1.10.0 TERRAGRUNT_VERSION: 0.57.5 TF_INPUT: false TF_VAR_client_vpn_access_group_id: ${{ secrets.PRODUCTION_CLIENT_VPN_ACCESS_GROUP_ID }} diff --git a/.github/workflows/terragrunt-plan-staging.yml b/.github/workflows/terragrunt-plan-staging.yml index 0f3d6d132..52795d9bb 100644 --- a/.github/workflows/terragrunt-plan-staging.yml +++ b/.github/workflows/terragrunt-plan-staging.yml @@ -11,7 +11,7 @@ on: env: AWS_REGION: ca-central-1 - TERRAFORM_VERSION: 1.9.8 + TERRAFORM_VERSION: 1.10.0 TERRAGRUNT_VERSION: 0.57.5 TF_INPUT: false TF_VAR_client_vpn_access_group_id: ${{ secrets.STAGING_CLIENT_VPN_ACCESS_GROUP_ID }} diff --git a/infrastructure/.devcontainer/devcontainer.json b/infrastructure/.devcontainer/devcontainer.json index ae2538d3d..1deb541d7 100644 --- a/infrastructure/.devcontainer/devcontainer.json +++ b/infrastructure/.devcontainer/devcontainer.json @@ -23,7 +23,7 @@ }, "features": { "terraform": { - "version": "1.9.8", + "version": "1.10.0", "tflint": "latest", "terragrunt": "0.57.5" } diff --git a/infrastructure/terragrunt/aws/database/rds.tf b/infrastructure/terragrunt/aws/database/rds.tf index d91894ea6..a793daf08 100644 --- a/infrastructure/terragrunt/aws/database/rds.tf +++ b/infrastructure/terragrunt/aws/database/rds.tf @@ -2,7 +2,7 @@ # RDS MySQL cluster across 3 subnets # module "rds_cluster" { - source = "github.com/cds-snc/terraform-modules//rds?ref=v10.1.0" + source = "github.com/cds-snc/terraform-modules//rds?ref=v10.2.0" name = "wordpress" database_name = var.database_name diff --git a/infrastructure/terragrunt/aws/ecr/oidc.tf b/infrastructure/terragrunt/aws/ecr/oidc.tf index adc8a0c03..5694c0052 100644 --- a/infrastructure/terragrunt/aws/ecr/oidc.tf +++ b/infrastructure/terragrunt/aws/ecr/oidc.tf @@ -3,7 +3,7 @@ locals { } module "ecr_tag_release" { - source = "github.com/cds-snc/terraform-modules//gh_oidc_role?ref=v10.1.0" + source = "github.com/cds-snc/terraform-modules//gh_oidc_role?ref=v10.2.0" billing_tag_value = var.billing_tag_value roles = [ { diff --git a/infrastructure/terragrunt/aws/ecs/cloudwatch_logs.tf b/infrastructure/terragrunt/aws/ecs/cloudwatch_logs.tf index 59fbbddc5..26fb221af 100644 --- a/infrastructure/terragrunt/aws/ecs/cloudwatch_logs.tf +++ b/infrastructure/terragrunt/aws/ecs/cloudwatch_logs.tf @@ -9,7 +9,7 @@ resource "aws_cloudwatch_log_group" "ecs_events" { } module "sentinel_forwarder" { - source = "github.com/cds-snc/terraform-modules//sentinel_forwarder?ref=v10.1.0" + source = "github.com/cds-snc/terraform-modules//sentinel_forwarder?ref=v10.2.0" function_name = "sentinel-forwarder" billing_tag_value = var.billing_tag_value diff --git a/infrastructure/terragrunt/aws/network/vpc.tf b/infrastructure/terragrunt/aws/network/vpc.tf index 3eecd675f..4a9286512 100644 --- a/infrastructure/terragrunt/aws/network/vpc.tf +++ b/infrastructure/terragrunt/aws/network/vpc.tf @@ -2,7 +2,7 @@ # VPC: 3 public + 3 private subnets across 3 availability zones # module "wordpress_vpc" { - source = "github.com/cds-snc/terraform-modules//vpc?ref=v10.1.0" + source = "github.com/cds-snc/terraform-modules//vpc?ref=v10.2.0" name = "wordpress" cidrsubnet_newbits = 8 diff --git a/infrastructure/terragrunt/aws/network/vpn.tf b/infrastructure/terragrunt/aws/network/vpn.tf index 3b06c5044..a9e37226d 100644 --- a/infrastructure/terragrunt/aws/network/vpn.tf +++ b/infrastructure/terragrunt/aws/network/vpn.tf @@ -1,5 +1,5 @@ module "vpn" { - source = "github.com/cds-snc/terraform-modules//client_vpn?ref=v10.1.0" + source = "github.com/cds-snc/terraform-modules//client_vpn?ref=v10.2.0" endpoint_name = "private_subnets" access_group_id = var.client_vpn_access_group_id diff --git a/infrastructure/terragrunt/aws/storage/s3.tf b/infrastructure/terragrunt/aws/storage/s3.tf index a3b4b0cd3..c9c0e16b4 100644 --- a/infrastructure/terragrunt/aws/storage/s3.tf +++ b/infrastructure/terragrunt/aws/storage/s3.tf @@ -1,5 +1,5 @@ module "wordpress_storage" { - source = "github.com/cds-snc/terraform-modules//S3?ref=v10.1.0" + source = "github.com/cds-snc/terraform-modules//S3?ref=v10.2.0" bucket_name = "platform-gc-articles-${var.env}-uploads" billing_tag_value = var.billing_tag_value } diff --git a/infrastructure/terragrunt/env/common/provider.tf b/infrastructure/terragrunt/env/common/provider.tf index 9d5944572..44c180b72 100644 --- a/infrastructure/terragrunt/env/common/provider.tf +++ b/infrastructure/terragrunt/env/common/provider.tf @@ -1,6 +1,6 @@ terraform { - required_version = "1.9.8" + required_version = "1.10.0" required_providers { aws = { source = "hashicorp/aws" diff --git a/wordpress/composer.json b/wordpress/composer.json index 4941996ab..95dce71cd 100644 --- a/wordpress/composer.json +++ b/wordpress/composer.json @@ -80,7 +80,7 @@ } ], "require": { - "wpackagist-plugin/two-factor": "^0.9.0", + "wpackagist-plugin/two-factor": "^0.10.0", "wpackagist-plugin/wps-hide-login": "^1.9", "wpml/sitepress-multilingual-cms": "*", "wpml/wpml-string-translation": "*", diff --git a/wordpress/composer.lock b/wordpress/composer.lock index cf895edab..fc648a9a2 100644 --- a/wordpress/composer.lock +++ b/wordpress/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a3aaf7ad16c48df165d7ed9a31fa75a0", + "content-hash": "4e1a5a3f4c7ac83a2a1cc4e8708dd111", "packages": [ { "name": "alphagov/notifications-php-client", @@ -4062,15 +4062,15 @@ }, { "name": "wpackagist-plugin/two-factor", - "version": "0.9.1", + "version": "0.10.0", "source": { "type": "svn", "url": "https://plugins.svn.wordpress.org/two-factor/", - "reference": "tags/0.9.1" + "reference": "tags/0.10.0" }, "dist": { "type": "zip", - "url": "https://downloads.wordpress.org/plugin/two-factor.0.9.1.zip" + "url": "https://downloads.wordpress.org/plugin/two-factor.0.10.0.zip" }, "require": { "composer/installers": "^1.0 || ^2.0"