passed initial checks for creating a fresh and a (snap) cloned database

Author: apolloakora

integration/postgres.test-main.tf

@@ -20,37 +20,44 @@ provider aws {
     }
 }
 
-
 locals {
     ecosystem_name = "integration"
-    new_db_name    = "brandnewbox"
-    cloned_db_name = "copycatbox"
+    fresh_db_name  = "brandnewbox"
+    clone_db_name  = "copycatbox"
+}
+
+
+variable in_id_of_db_to_clone {
+    description = "The ID of mummy database to clone from."
 }
 
+output out_fresh_database_hostname { value = module.fresh_db.out_fresh_db_hostname }
+output out_fresh_database_hostport { value = module.fresh_db.out_fresh_db_hostport }
+
+output out_clone_database_hostname { value = module.clone_db.out_clone_db_hostname }
+output out_clone_database_hostport { value = module.clone_db.out_clone_db_hostport }
 
-output out_database_hostname { value = module.postgres_db.out_database_hostname }
-output out_database_hostport { value = module.postgres_db.out_database_hostport }
-output out_database_username { value = module.postgres_db.out_database_username }
-output out_database_password { value = module.postgres_db.out_database_password }
+output out_fresh_database_username { value = module.fresh_db.out_database_username }
+output out_fresh_database_password { value = module.fresh_db.out_database_password }
 
 
-module brand_new_db {
+module fresh_db {
 
     source = "./.."
 
     in_security_group_id = module.security-group.out_security_group_id
     in_db_subnet_ids     = module.vpc-network.out_private_subnet_ids
     in_id_of_db_to_clone = var.in_id_of_db_to_clone
 
-    in_database_name = local.data_base_name
+    in_database_name = local.fresh_db_name
 
     in_ecosystem_name  = local.ecosystem_name
     in_tag_timestamp   = module.resource-tags.out_tag_timestamp
     in_tag_description = module.resource-tags.out_tag_description
 }
 
 
-module cloned_db {
+module clone_db {
 
     source = "./.."
 
@@ -59,7 +66,7 @@ module cloned_db {
     in_id_of_db_to_clone = var.in_id_of_db_to_clone
     in_clone_snapshot = true
 
-    in_database_name = local.data_base_name
+    in_database_name = local.clone_db_name
 
     in_ecosystem_name  = local.ecosystem_name
     in_tag_timestamp   = module.resource-tags.out_tag_timestamp

rds.postgres-main.tf

@@ -26,7 +26,7 @@ locals {
 resource aws_db_instance fresh {
 
     count = var.in_clone_snapshot ? 0 : 1
-    identifier = "${ var.in_database_name }-${ var.in_ecosystem_name }-${ var.in_tag_timestamp }"
+    identifier = "${ var.in_database_name }-fresh-${ var.in_ecosystem_name }-${ var.in_tag_timestamp }"
 
     name     = var.in_database_name
     username = local.db_username
@@ -73,8 +73,8 @@ resource aws_db_instance clone {
 
     count = var.in_clone_snapshot ? 1 : 0
 
-    snapshot_identifier = data.aws_db_snapshot.parent[0].result
-    identifier = "${ var.in_database_name }-${ var.in_ecosystem_name }-${ var.in_tag_timestamp }"
+    snapshot_identifier = data.aws_db_snapshot.from[0].id
+    identifier = "${ var.in_database_name }-clone-${ var.in_ecosystem_name }-${ var.in_tag_timestamp }"
 
     name     = var.in_database_name
     username = local.db_username
@@ -99,7 +99,7 @@ resource aws_db_instance clone {
         Name  = var.in_database_name
         Id    = "${ var.in_database_name }-${ var.in_ecosystem_name }-${ var.in_tag_timestamp }"
         Class = "${ var.in_ecosystem_name }"
-        Desc   = "This PostgreSQL database named ${ var.in_database_name } was cloned from snapshot ${ data.aws_db_snapshot.parent[0].result } and ${ var.in_tag_description }"
+        Desc   = "This PostgreSQL database named ${ var.in_database_name } was cloned from snapshot ${ data.aws_db_snapshot.from[0].id } and ${ var.in_tag_description }"
     }
 }
 

rds.postgres-outputs.tf

@@ -12,6 +12,7 @@
 */
 output out_fresh_db_hostname { value = length( aws_db_instance.fresh ) == 0 ? "n/a" : aws_db_instance.fresh[0].address  }
 output out_fresh_db_hostport { value = length( aws_db_instance.fresh ) == 0 ? "n/a" : aws_db_instance.fresh[0].endpoint }
+
 output out_clone_db_hostname { value = length( aws_db_instance.clone ) == 0 ? "n/a" : aws_db_instance.clone[0].address  }
 output out_clone_db_hostport { value = length( aws_db_instance.clone ) == 0 ? "n/a" : aws_db_instance.clone[0].endpoint }
 

rds.postgres-variables.tf

@@ -18,7 +18,7 @@ variable in_clone_snapshot {
 }
 
 variable in_id_of_db_to_clone {
-    description = "If the ID of mummy database to clone is omitted the parameter will not be set."
+    description = "The ID of mummy database whose snapshot the database will be cloned from."
     default = ""
 }