From a81e854ee4eb168b6507a73c43a90991bdef6016 Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Tue, 25 Nov 2025 15:43:54 +0000 Subject: [PATCH 1/6] introducing another cluster --- aws/components/base/docdb_cluster.tf | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/aws/components/base/docdb_cluster.tf b/aws/components/base/docdb_cluster.tf index db60698..3277066 100755 --- a/aws/components/base/docdb_cluster.tf +++ b/aws/components/base/docdb_cluster.tf @@ -16,3 +16,25 @@ resource "aws_docdb_cluster" "base_db_cluster" { Name = "${local.resource_prefix}-dbcluster" }) } + +resource "aws_docdb_cluster" "base_db_cluster_ver_5_0" { + cluster_identifier = "${replace(local.resource_prefix,"_","-")}-dbcluster-ver-5-0" + engine = "docdb" + engine_version = "4.0" + master_username = var.docdb_master_user + master_password = var.docdb_master_password + backup_retention_period = var.docdb_retention_period + skip_final_snapshot = true + db_subnet_group_name = aws_docdb_subnet_group.base_db_subnet_group.name + db_cluster_parameter_group_name = aws_docdb_cluster_parameter_group.base_db_parameters.name + vpc_security_group_ids = [ aws_security_group.docdb_sg.id ] + enabled_cloudwatch_logs_exports = ["audit"] + storage_encrypted = var.docdb_storage_encrypted + kms_key_id = var.docdb_kms_key_id + + snapshot_identifier = "arn:aws:rds:region:acct:snapshot:nia-ptl-base-dbcluster-snapshot-25112025" + + tags = merge(local.default_tags,{ + Name = "${local.resource_prefix}-dbcluster-ver-5-0" + }) +} From 5059c462f968040c9c66efff70ba7d947fcb0c81 Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Wed, 26 Nov 2025 10:49:58 +0000 Subject: [PATCH 2/6] introducing another cluster instance --- aws/components/base/docdb_instance.tf | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/aws/components/base/docdb_instance.tf b/aws/components/base/docdb_instance.tf index 4e88ac7..2e929e8 100755 --- a/aws/components/base/docdb_instance.tf +++ b/aws/components/base/docdb_instance.tf @@ -9,4 +9,17 @@ resource "aws_docdb_cluster_instance" "base_db_instance" { tags = merge(local.default_tags,{ Name = "${local.resource_prefix}-dbinstance-${count.index}" }) +} + +resource "aws_docdb_cluster_instance" "base_db_instance_ver_5_0" { + count = var.docdb_instance_count + identifier = "${replace(local.resource_prefix,"_","-")}-dbinstance-ver-5-0-${count.index}" + cluster_identifier = aws_docdb_cluster.base_db_cluster_ver_5_0.id + instance_class = var.docdb_instance_class + apply_immediately = true + availability_zone = local.availability_zones[ count.index ] + + tags = merge(local.default_tags,{ + Name = "${local.resource_prefix}-dbinstance-ver-5-0-${count.index}" + }) } \ No newline at end of file From dcdd14e0dc345a65b84e97d5d6d58d9653fe1152 Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Wed, 26 Nov 2025 11:14:02 +0000 Subject: [PATCH 3/6] cluster param corrections --- aws/components/base/docdb_cluster.tf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/aws/components/base/docdb_cluster.tf b/aws/components/base/docdb_cluster.tf index 3277066..db24448 100755 --- a/aws/components/base/docdb_cluster.tf +++ b/aws/components/base/docdb_cluster.tf @@ -20,9 +20,6 @@ resource "aws_docdb_cluster" "base_db_cluster" { resource "aws_docdb_cluster" "base_db_cluster_ver_5_0" { cluster_identifier = "${replace(local.resource_prefix,"_","-")}-dbcluster-ver-5-0" engine = "docdb" - engine_version = "4.0" - master_username = var.docdb_master_user - master_password = var.docdb_master_password backup_retention_period = var.docdb_retention_period skip_final_snapshot = true db_subnet_group_name = aws_docdb_subnet_group.base_db_subnet_group.name @@ -32,7 +29,7 @@ resource "aws_docdb_cluster" "base_db_cluster_ver_5_0" { storage_encrypted = var.docdb_storage_encrypted kms_key_id = var.docdb_kms_key_id - snapshot_identifier = "arn:aws:rds:region:acct:snapshot:nia-ptl-base-dbcluster-snapshot-25112025" + snapshot_identifier = "arn:aws:rds:region:acct:cluster-snapshot:nia-ptl-base-dbcluster-snapshot-25112025" tags = merge(local.default_tags,{ Name = "${local.resource_prefix}-dbcluster-ver-5-0" From 86ebee76eb372450a8417f6d2994b9f95c0f9f72 Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Wed, 26 Nov 2025 13:34:14 +0000 Subject: [PATCH 4/6] cluster param corrections --- aws/components/base/docdb_cluster.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/components/base/docdb_cluster.tf b/aws/components/base/docdb_cluster.tf index db24448..1b5d32b 100755 --- a/aws/components/base/docdb_cluster.tf +++ b/aws/components/base/docdb_cluster.tf @@ -20,10 +20,10 @@ resource "aws_docdb_cluster" "base_db_cluster" { resource "aws_docdb_cluster" "base_db_cluster_ver_5_0" { cluster_identifier = "${replace(local.resource_prefix,"_","-")}-dbcluster-ver-5-0" engine = "docdb" + engine_version = "4.0" backup_retention_period = var.docdb_retention_period skip_final_snapshot = true db_subnet_group_name = aws_docdb_subnet_group.base_db_subnet_group.name - db_cluster_parameter_group_name = aws_docdb_cluster_parameter_group.base_db_parameters.name vpc_security_group_ids = [ aws_security_group.docdb_sg.id ] enabled_cloudwatch_logs_exports = ["audit"] storage_encrypted = var.docdb_storage_encrypted From 609c1781ccbc4972f9c3cdd5b870f940d9e98272 Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Wed, 26 Nov 2025 14:00:46 +0000 Subject: [PATCH 5/6] cluster param corrections --- aws/components/base/docdb_cluster.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/components/base/docdb_cluster.tf b/aws/components/base/docdb_cluster.tf index 1b5d32b..4f3a08e 100755 --- a/aws/components/base/docdb_cluster.tf +++ b/aws/components/base/docdb_cluster.tf @@ -29,7 +29,7 @@ resource "aws_docdb_cluster" "base_db_cluster_ver_5_0" { storage_encrypted = var.docdb_storage_encrypted kms_key_id = var.docdb_kms_key_id - snapshot_identifier = "arn:aws:rds:region:acct:cluster-snapshot:nia-ptl-base-dbcluster-snapshot-25112025" + snapshot_identifier = "arn:aws:rds:eu-west-2:067756640211:cluster-snapshot:nia-ptl-base-dbcluster-snapshot-25112025" tags = merge(local.default_tags,{ Name = "${local.resource_prefix}-dbcluster-ver-5-0" From f67ad72bc108e795ea2310ba8c07d51eebb0f50a Mon Sep 17 00:00:00 2001 From: ORybak5 <12736698+ORybak5@users.noreply.github.com> Date: Fri, 28 Nov 2025 14:20:47 +0000 Subject: [PATCH 6/6] upgrading documentDB to ver. 5.0 --- aws/components/base/docdb_cluster.tf | 20 +------------------- aws/components/base/docdb_instance.tf | 13 ------------- aws/components/base/docdb_parameter_group.tf | 6 +++--- 3 files changed, 4 insertions(+), 35 deletions(-) diff --git a/aws/components/base/docdb_cluster.tf b/aws/components/base/docdb_cluster.tf index 4f3a08e..e1441f4 100755 --- a/aws/components/base/docdb_cluster.tf +++ b/aws/components/base/docdb_cluster.tf @@ -1,6 +1,7 @@ resource "aws_docdb_cluster" "base_db_cluster" { cluster_identifier = "${replace(local.resource_prefix,"_","-")}-dbcluster" engine = "docdb" + engine_version = "5.0" master_username = var.docdb_master_user master_password = var.docdb_master_password backup_retention_period = var.docdb_retention_period @@ -16,22 +17,3 @@ resource "aws_docdb_cluster" "base_db_cluster" { Name = "${local.resource_prefix}-dbcluster" }) } - -resource "aws_docdb_cluster" "base_db_cluster_ver_5_0" { - cluster_identifier = "${replace(local.resource_prefix,"_","-")}-dbcluster-ver-5-0" - engine = "docdb" - engine_version = "4.0" - backup_retention_period = var.docdb_retention_period - skip_final_snapshot = true - db_subnet_group_name = aws_docdb_subnet_group.base_db_subnet_group.name - vpc_security_group_ids = [ aws_security_group.docdb_sg.id ] - enabled_cloudwatch_logs_exports = ["audit"] - storage_encrypted = var.docdb_storage_encrypted - kms_key_id = var.docdb_kms_key_id - - snapshot_identifier = "arn:aws:rds:eu-west-2:067756640211:cluster-snapshot:nia-ptl-base-dbcluster-snapshot-25112025" - - tags = merge(local.default_tags,{ - Name = "${local.resource_prefix}-dbcluster-ver-5-0" - }) -} diff --git a/aws/components/base/docdb_instance.tf b/aws/components/base/docdb_instance.tf index 2e929e8..4e88ac7 100755 --- a/aws/components/base/docdb_instance.tf +++ b/aws/components/base/docdb_instance.tf @@ -9,17 +9,4 @@ resource "aws_docdb_cluster_instance" "base_db_instance" { tags = merge(local.default_tags,{ Name = "${local.resource_prefix}-dbinstance-${count.index}" }) -} - -resource "aws_docdb_cluster_instance" "base_db_instance_ver_5_0" { - count = var.docdb_instance_count - identifier = "${replace(local.resource_prefix,"_","-")}-dbinstance-ver-5-0-${count.index}" - cluster_identifier = aws_docdb_cluster.base_db_cluster_ver_5_0.id - instance_class = var.docdb_instance_class - apply_immediately = true - availability_zone = local.availability_zones[ count.index ] - - tags = merge(local.default_tags,{ - Name = "${local.resource_prefix}-dbinstance-ver-5-0-${count.index}" - }) } \ No newline at end of file diff --git a/aws/components/base/docdb_parameter_group.tf b/aws/components/base/docdb_parameter_group.tf index 1b82dec..c0e112d 100755 --- a/aws/components/base/docdb_parameter_group.tf +++ b/aws/components/base/docdb_parameter_group.tf @@ -1,6 +1,6 @@ resource "aws_docdb_cluster_parameter_group" "base_db_parameters" { - name = "${replace(local.resource_prefix,"_","-")}-db-parameters-36" - family = "docdb4.0" + name = "${replace(local.resource_prefix,"_","-")}-db-parameters-50" + family = "docdb5.0" description = "Parameter group for MongoDB in env: ${var.environment}" parameter { @@ -15,6 +15,6 @@ resource "aws_docdb_cluster_parameter_group" "base_db_parameters" { # } tags = merge(local.default_tags,{ - Name = "${replace(local.resource_prefix,"_","-")}-db-parameters-36" + Name = "${replace(local.resource_prefix,"_","-")}-db-parameters-50" }) } \ No newline at end of file