diff --git a/.github/workflows/deploy-production-container.yml b/.github/workflows/deploy-production-container.yml index b72a98705..ed00fc893 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.8.4 + TERRAFORM_VERSION: 1.8.5 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 2b3ece806..96a794b25 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.8.4 + TERRAFORM_VERSION: 1.8.5 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 0499e6fd7..cf00f2700 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.8.4 + TERRAFORM_VERSION: 1.8.5 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 e9d0cf1b1..66d6a921e 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.8.4 + TERRAFORM_VERSION: 1.8.5 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 8bf5ee2c3..f683c855d 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.8.4 + TERRAFORM_VERSION: 1.8.5 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 ff989954d..df5da5ecc 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.8.4 + TERRAFORM_VERSION: 1.8.5 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 f052d974a..177231acf 100644 --- a/infrastructure/.devcontainer/devcontainer.json +++ b/infrastructure/.devcontainer/devcontainer.json @@ -23,7 +23,7 @@ }, "features": { "terraform": { - "version": "1.8.4", + "version": "1.8.5", "tflint": "latest", "terragrunt": "0.57.5" } diff --git a/infrastructure/terragrunt/aws/database/rds.tf b/infrastructure/terragrunt/aws/database/rds.tf index 4b838babd..1f7c1fe6f 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=v9.4.8" + source = "github.com/cds-snc/terraform-modules//rds?ref=v9.4.9" name = "wordpress" database_name = var.database_name diff --git a/infrastructure/terragrunt/aws/ecr/oidc.tf b/infrastructure/terragrunt/aws/ecr/oidc.tf index e660dcbca..8bb11ffa6 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=v9.4.8" + source = "github.com/cds-snc/terraform-modules//gh_oidc_role?ref=v9.4.9" 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 9ec60522e..adac482c4 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=v9.4.8" + source = "github.com/cds-snc/terraform-modules//sentinel_forwarder?ref=v9.4.9" 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 39e12bcc5..601cf9fff 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=v9.4.8" + source = "github.com/cds-snc/terraform-modules//vpc?ref=v9.4.9" name = "wordpress" cidrsubnet_newbits = 8 diff --git a/infrastructure/terragrunt/aws/network/vpn.tf b/infrastructure/terragrunt/aws/network/vpn.tf index a755b0c54..4dc4609c5 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=v9.4.8" + source = "github.com/cds-snc/terraform-modules//client_vpn?ref=v9.4.9" 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 eda6db7cb..d7ae4a993 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=v9.4.8" + source = "github.com/cds-snc/terraform-modules//S3?ref=v9.4.9" 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 007d4e88c..470635f57 100644 --- a/infrastructure/terragrunt/env/common/provider.tf +++ b/infrastructure/terragrunt/env/common/provider.tf @@ -1,6 +1,6 @@ terraform { - required_version = "1.8.4" + required_version = "1.8.5" required_providers { aws = { source = "hashicorp/aws" diff --git a/wordpress/wp-content/plugins/cds-base/composer.json b/wordpress/wp-content/plugins/cds-base/composer.json index 7dc819501..475f2a3a4 100644 --- a/wordpress/wp-content/plugins/cds-base/composer.json +++ b/wordpress/wp-content/plugins/cds-base/composer.json @@ -17,7 +17,7 @@ "alphagov/notifications-php-client": "^4.2", "ramsey/uuid": "4.7.6", "ua-parser/uap-php": "^3.9", - "nesbot/carbon": "2.72.3", + "nesbot/carbon": "2.72.5", "illuminate/encryption": "^8.63", "illuminate/support": "^8.63" }, diff --git a/wordpress/wp-content/plugins/cds-base/composer.lock b/wordpress/wp-content/plugins/cds-base/composer.lock index 5f1ddd962..ad80afbbc 100644 --- a/wordpress/wp-content/plugins/cds-base/composer.lock +++ b/wordpress/wp-content/plugins/cds-base/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": "371923d68e830279302db1b386179ae9", + "content-hash": "3aa9bb307d9dca74566b7c8926e4c52e", "packages": [ { "name": "alphagov/notifications-php-client", @@ -1053,16 +1053,16 @@ }, { "name": "nesbot/carbon", - "version": "2.72.3", + "version": "2.72.5", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83" + "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83", - "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/afd46589c216118ecd48ff2b95d77596af1e57ed", + "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed", "shasum": "" }, "require": { @@ -1096,8 +1096,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-3.x": "3.x-dev", - "dev-master": "2.x-dev" + "dev-master": "3.x-dev", + "dev-2.x": "2.x-dev" }, "laravel": { "providers": [ @@ -1156,7 +1156,7 @@ "type": "tidelift" } ], - "time": "2024-01-25T10:35:09+00:00" + "time": "2024-06-03T19:18:41+00:00" }, { "name": "php-http/guzzle6-adapter",