feat: added existing instance test and refactored tests

Author: Aditya-ranjan-16

examples/backup-restore/README.MD

@@ -4,4 +4,4 @@ This example provides an end-to-end executable flow of how a Elasticsearch DB ca
 
 - Create a new resource group if one is not passed in.
 - Create a new ICD Elasticsearch database instance if no existing backup crn is provided.
-- Create a restored ICD Elasticsearch database instance pointing to the backup of the first instance.
+- Create a restored ICD Elasticsearch database instance pointing to the backup of the first instance.

examples/backup-restore/catalogValidationValues.json.template

@@ -3,4 +3,4 @@
   "region": "us-south",
   "resource_tags": $TAGS,
   "prefix": $PREFIX
-}
+}

examples/backup-restore/main.tf

@@ -16,13 +16,13 @@ data "ibm_database_backups" "backup_database" {
 }
 # New elasticsearch instance pointing to the backup instance
 module "restored_icd_elasticsearch" {
-  source             = "../.."
-  resource_group_id  = module.resource_group.resource_group_id
-  name               = "${var.prefix}-elasticsearch-restored"
+  source                = "../.."
+  resource_group_id     = module.resource_group.resource_group_id
+  name                  = "${var.prefix}-elasticsearch-restored"
   elasticsearch_version = var.elasticsearch_version
-  region             = var.region
-  tags      = var.resource_tags
-  access_tags        = var.access_tags
-  member_host_flavor = "multitenant"
-  backup_crn         = data.ibm_database_backups.backup_database.backups[0].backup_id
-}
+  region                = var.region
+  tags                  = var.resource_tags
+  access_tags           = var.access_tags
+  member_host_flavor    = "multitenant"
+  backup_crn            = data.ibm_database_backups.backup_database.backups[0].backup_id
+}

examples/backup-restore/outputs.tf

@@ -9,4 +9,4 @@ output "restored_icd_elasticsearch_id" {
 output "restored_icd_elasticsearch_version" {
   description = "Restored elasticsearch instance version"
   value       = module.restored_icd_elasticsearch.version
-}
+}

examples/backup-restore/provider.tf

@@ -1,4 +1,4 @@
 provider "ibm" {
   ibmcloud_api_key = var.ibmcloud_api_key
   region           = var.region
-}
+}

examples/backup-restore/variables.tf

@@ -13,12 +13,12 @@ variable "region" {
 variable "prefix" {
   type        = string
   description = "Prefix to append to all resources created by this example"
-  default = "backup"
+  default     = "backup"
 }
 
 variable "elasticsearch_version" {
   type        = string
-   description = "Version of the elasticsearch instance. If no value passed, the current ICD preferred version is used."
+  description = "Version of the elasticsearch instance. If no value passed, the current ICD preferred version is used."
   default     = null
 }
 variable "resource_group" {
@@ -43,4 +43,4 @@ variable "elasticsearch_db_backup_crn" {
   type        = string
   description = "The existing CRN of a backup resource to restore from. If null then it will create a new instance first and then create another instance pointing to the backup of the first instance."
   default     = null
-}
+}

examples/backup-restore/version.tf

@@ -8,4 +8,4 @@ terraform {
       version = ">=1.70.0, <2.0.0"
     }
   }
-}
+}

examples/basic/main.tf

@@ -13,14 +13,16 @@ module "resource_group" {
 # Elasticsearch Instance
 ##############################################################################
 
-module "icd_elasticsearch" {
+module "database" {
   source                = "../../"
   resource_group_id     = module.resource_group.resource_group_id
-  name                  = "${var.prefix}-elasticsearch"
+  name                  = "${var.prefix}-data-store"
   region                = var.region
   elasticsearch_version = var.elasticsearch_version
   tags                  = var.resource_tags
   access_tags           = var.access_tags
+  service_endpoints     = var.service_endpoints
+  member_host_flavor    = var.member_host_flavor
   service_credential_names = {
     "elasticsearch_admin" : "Administrator",
     "elasticsearch_operator" : "Operator",
@@ -32,7 +34,7 @@ module "icd_elasticsearch" {
 # wait 60 secs to allow IAM credential access to kick in before configuring instance
 # without the wait, you can intermittently get "Error 401 (Unauthorized)"
 resource "time_sleep" "wait" {
-  depends_on      = [module.icd_elasticsearch]
+  depends_on      = [module.database]
   create_duration = "60s"
 }
 

examples/basic/outputs.tf

@@ -2,32 +2,37 @@
 # Outputs
 ##############################################################################
 output "id" {
-  description = "Elasticsearch id"
-  value       = module.icd_elasticsearch.id
+  description = "Database instance id"
+  value       = module.database.id
+}
+
+output "elasticsearch_crn" {
+  description = "Elasticsearch CRN"
+  value       = module.database.crn
 }
 
 output "version" {
   description = "Enterprise DB instance version"
-  value       = module.icd_elasticsearch.version
+  value       = module.database.version
 }
 
 output "adminuser" {
   description = "Database admin user name"
-  value       = module.icd_elasticsearch.adminuser
+  value       = module.database.adminuser
 }
 
 output "hostname" {
   description = "Database connection hostname"
-  value       = module.icd_elasticsearch.hostname
+  value       = module.database.hostname
 }
 
 output "port" {
   description = "Database connection port"
-  value       = module.icd_elasticsearch.port
+  value       = module.database.port
 }
 
 output "certificate_base64" {
   description = "Database connection certificate"
-  value       = module.icd_elasticsearch.certificate_base64
+  value       = module.database.certificate_base64
   sensitive   = true
 }

examples/basic/provider.tf

@@ -4,8 +4,8 @@ provider "ibm" {
 }
 
 provider "elasticsearch" {
-  username    = module.icd_elasticsearch.service_credentials_object.credentials["elasticsearch_admin"].username
-  password    = module.icd_elasticsearch.service_credentials_object.credentials["elasticsearch_admin"].password
-  url         = "https://${module.icd_elasticsearch.service_credentials_object.hostname}:${module.icd_elasticsearch.service_credentials_object.port}"
-  cacert_file = base64decode(module.icd_elasticsearch.service_credentials_object.certificate)
+  username    = module.database.service_credentials_object.credentials["elasticsearch_admin"].username
+  password    = module.database.service_credentials_object.credentials["elasticsearch_admin"].password
+  url         = "https://${module.database.service_credentials_object.hostname}:${module.database.service_credentials_object.port}"
+  cacert_file = base64decode(module.database.service_credentials_object.certificate)
 }