SP-2514 - Bump PostgreSQL & Terraform minor version, Serverless V2 Ze…

…ro Capacity Scaling #minor
ministryofjustice · Jan 2, 2025 · 8490a5e · 8490a5e
1 parent ecf98ba
commit 8490a5e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/terraform/aurora.tf b/terraform/aurora.tf
@@ -8,7 +8,7 @@ resource "aws_rds_cluster" "cluster" {
   deletion_protection             = true
   engine                          = "aurora-postgresql"
   engine_mode                     = "provisioned"
-  engine_version                  = "13.12"
+  engine_version                  = "13.16"
   enabled_cloudwatch_logs_exports = ["postgresql"]
   final_snapshot_identifier       = "response-${local.environment}-final-snapshot"
   kms_key_id                      = data.aws_kms_key.rds.arn
@@ -21,15 +21,14 @@ resource "aws_rds_cluster" "cluster" {
   vpc_security_group_ids          = [aws_security_group.response_rds.id]
 
   serverlessv2_scaling_configuration {
-    min_capacity = 0.5
+    min_capacity = 0
     max_capacity = 4
   }
 
   lifecycle {
     prevent_destroy = true
     ignore_changes = [
-      engine_version,
-      global_cluster_identifier
+      engine_version
     ]
   }
 }

diff --git a/terraform/versions.tf b/terraform/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "1.9.8"
+  required_version = "1.10.3"
   required_providers {
     aws = {
       source  = "hashicorp/aws"
@@ -8,11 +8,13 @@ terraform {
   }
 
   backend "s3" {
-    bucket         = "opg.terraform.state"
-    key            = "opg-incident-response/terraform.tfstate"
-    encrypt        = true
-    region         = "eu-west-1"
-    role_arn       = "arn:aws:iam::311462405659:role/incident-response-ci"
+    bucket  = "opg.terraform.state"
+    key     = "opg-incident-response/terraform.tfstate"
+    encrypt = true
+    region  = "eu-west-1"
+    assume_role = {
+      role_arn = "arn:aws:iam::311462405659:role/incident-response-ci"
+    }
     dynamodb_table = "remote_lock"
   }
 }