feat: added the ability to set the host flavor using input variable member_host_flavor<br>- the default value of member_memory_mb has been updated to 4096<br><br>### [Cloud Database Hosting Models](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hosting-models)<br>The [host model switching](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hosting-models&interface=api#hosting-models-switching) section has details of the migrations that the service is rolling out. All instances will have to be switched and the [time line](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hosting-models&interface=api#hosting-model-transition-timeline) for the migrations is outlined.<br><br>During the transition both existing and new models are supported.<br><br>Users of this module should consider the changes being implemented by the service. It is recommended that new deployments use the shared or isolated compute models to start, by specifying the member_host_flavor. It is recommended that existing deployments make updates to control the upgrade process by specifying shared or isolate compute configurations and the resource required to run the service, by adding the member_host_flavor. (#184)

Author: shemau

README.md

@@ -96,7 +96,8 @@ You need the following permissions to run this module.
 | <a name="input_kms_key_crn"></a> [kms\_key\_crn](#input\_kms\_key\_crn) | The root key CRN of a Key Management Services like Key Protect or Hyper Protect Crypto Service (HPCS) that you want to use for disk encryption. Only used if var.kms\_encryption\_enabled is set to true. | `string` | `null` | no |
 | <a name="input_member_cpu_count"></a> [member\_cpu\_count](#input\_member\_cpu\_count) | Allocated dedicated CPU per member. For shared CPU, set to 0. For more information, see https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling | `number` | `0` | no |
 | <a name="input_member_disk_mb"></a> [member\_disk\_mb](#input\_member\_disk\_mb) | Allocated disk per-member. For more information, see https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling | `number` | `5120` | no |
-| <a name="input_member_memory_mb"></a> [member\_memory\_mb](#input\_member\_memory\_mb) | Allocated memory per-member. For more information, see https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling | `number` | `1024` | no |
+| <a name="input_member_host_flavor"></a> [member\_host\_flavor](#input\_member\_host\_flavor) | Allocated host flavor per member. [Learn more](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/database#host_flavor). | `string` | `null` | no |
+| <a name="input_member_memory_mb"></a> [member\_memory\_mb](#input\_member\_memory\_mb) | Allocated memory per-member. For more information, see https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling | `number` | `4096` | no |
 | <a name="input_members"></a> [members](#input\_members) | Allocated number of members. For more information, see https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling | `number` | `3` | no |
 | <a name="input_name"></a> [name](#input\_name) | The name to give the Elasticsearch instance. | `string` | n/a | yes |
 | <a name="input_plan"></a> [plan](#input\_plan) | The name of the service plan that you choose for your Elasticsearch instance | `string` | `"enterprise"` | no |

examples/complete/main.tf

@@ -29,10 +29,12 @@ module "key_protect_all_inclusive" {
   resource_tags             = var.resource_tags
   keys = [
     {
-      key_ring_name = "icd"
+      key_ring_name         = "icd"
+      force_delete_key_ring = true
       keys = [
         {
-          key_name = "${var.prefix}-elasticsearch"
+          key_name     = "${var.prefix}-elasticsearch"
+          force_delete = true
         }
       ]
     }
@@ -59,6 +61,8 @@ module "icd_elasticsearch" {
   kms_key_crn                = module.key_protect_all_inclusive.keys["icd.${var.prefix}-elasticsearch"].crn
   tags                       = var.resource_tags
   auto_scaling               = var.auto_scaling
+  member_host_flavor         = "multitenant"
+  member_memory_mb           = 4096
 }
 
 # wait 15 secs to allow IAM credential access to kick in before configuring instance

examples/fscloud/main.tf

@@ -65,6 +65,7 @@ module "elasticsearch" {
   elasticsearch_version      = var.elasticsearch_version
   service_credential_names   = var.service_credential_names
   auto_scaling               = var.auto_scaling
+  member_host_flavor         = "b3c.4x16.encrypted"
   cbr_rules = [
     {
       description      = "${var.prefix}-elasticsearch access only from vpc"

main.tf

@@ -16,6 +16,9 @@ locals {
   # Determine if auto scaling is enabled
   auto_scaling_enabled = var.auto_scaling == null ? [] : [1]
 
+  # Determine if host_flavor is used
+  host_flavor_set = var.member_host_flavor != null ? true : false
+
   # Determine what KMS service is being used for database encryption
   kms_service = var.kms_key_crn != null ? (
     can(regex(".*kms.*", var.kms_key_crn)) ? "kms" : (
@@ -67,23 +70,65 @@ resource "ibm_database" "elasticsearch" {
     }
   }
 
-  group {
-    group_id = "member"
-
-    memory {
-      allocation_mb = var.member_memory_mb
-    }
-
-    disk {
-      allocation_mb = var.member_disk_mb
+  ## This for_each block is NOT a loop to attach to multiple group blocks.
+  ## This is used to conditionally add one, OR, the other group block depending on var.local.host_flavor_set
+  ## This block is for if host_flavor IS set to specific pre-defined host sizes and not set to "multitenant"
+  dynamic "group" {
+    for_each = local.host_flavor_set && var.member_host_flavor != "multitenant" ? [1] : []
+    content {
+      group_id = "member" # Only member type is allowed for postgresql
+      host_flavor {
+        id = var.member_host_flavor
+      }
+      disk {
+        allocation_mb = var.member_disk_mb
+      }
+      members {
+        allocation_count = var.members
+      }
     }
+  }
 
-    cpu {
-      allocation_count = var.member_cpu_count
+  ## This block is for if host_flavor IS set to "multitenant"
+  dynamic "group" {
+    for_each = local.host_flavor_set && var.member_host_flavor == "multitenant" ? [1] : []
+    content {
+      group_id = "member" # Only member type is allowed for postgresql
+      host_flavor {
+        id = var.member_host_flavor
+      }
+      disk {
+        allocation_mb = var.member_disk_mb
+      }
+      memory {
+        allocation_mb = var.member_memory_mb
+      }
+      cpu {
+        allocation_count = var.member_cpu_count
+      }
+      members {
+        allocation_count = var.members
+      }
     }
+  }
 
-    members {
-      allocation_count = var.members
+  ## This block is for if host_flavor IS NOT set
+  dynamic "group" {
+    for_each = local.host_flavor_set ? [] : [1]
+    content {
+      group_id = "member" # Only member type is allowed for postgresql
+      memory {
+        allocation_mb = var.member_memory_mb
+      }
+      disk {
+        allocation_mb = var.member_disk_mb
+      }
+      cpu {
+        allocation_count = var.member_cpu_count
+      }
+      members {
+        allocation_count = var.members
+      }
     }
   }
 

modules/fscloud/README.md

@@ -40,7 +40,8 @@ No resources.
 | <a name="input_kms_key_crn"></a> [kms\_key\_crn](#input\_kms\_key\_crn) | The root key CRN of the Hyper Protect Crypto Service (HPCS) to use for disk encryption. | `string` | n/a | yes |
 | <a name="input_member_cpu_count"></a> [member\_cpu\_count](#input\_member\_cpu\_count) | Allocated dedicated CPU per member. For shared CPU, set to 0. For more information, see https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling | `number` | `0` | no |
 | <a name="input_member_disk_mb"></a> [member\_disk\_mb](#input\_member\_disk\_mb) | Allocated disk per-member. For more information, see https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling | `number` | `5120` | no |
-| <a name="input_member_memory_mb"></a> [member\_memory\_mb](#input\_member\_memory\_mb) | Allocated memory per-member. For more information, see https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling | `number` | `1024` | no |
+| <a name="input_member_host_flavor"></a> [member\_host\_flavor](#input\_member\_host\_flavor) | Allocated host flavor per member. [Learn more](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/database#host_flavor). | `string` | `null` | no |
+| <a name="input_member_memory_mb"></a> [member\_memory\_mb](#input\_member\_memory\_mb) | Allocated memory per member. [Learn more](https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling). | `number` | `4096` | no |
 | <a name="input_members"></a> [members](#input\_members) | Allocated number of members. For more information, see https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling | `number` | `3` | no |
 | <a name="input_name"></a> [name](#input\_name) | Name of the Elasticsearch instance | `string` | n/a | yes |
 | <a name="input_plan"></a> [plan](#input\_plan) | The name of the service plan that you choose for your Elasticsearch instance | `string` | `"enterprise"` | no |

modules/fscloud/main.tf

@@ -21,6 +21,7 @@ module "elasticsearch" {
   users                         = var.users
   member_disk_mb                = var.member_disk_mb
   member_cpu_count              = var.member_cpu_count
+  member_host_flavor            = var.member_host_flavor
   auto_scaling                  = var.auto_scaling
   service_credential_names      = var.service_credential_names
 }

modules/fscloud/variables.tf

@@ -52,8 +52,8 @@ variable "members" {
 
 variable "member_memory_mb" {
   type        = number
-  description = "Allocated memory per-member. For more information, see https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling"
-  default     = 1024
+  description = "Allocated memory per member. [Learn more](https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling)."
+  default     = 4096
   # Validation is done in the Terraform plan phase by the IBM provider, so no need to add extra validation here.
 }
 
@@ -72,6 +72,12 @@ variable "member_disk_mb" {
   # Validation is done in the Terraform plan phase by the IBM provider, so no need to add extra validation here.
 }
 
+variable "member_host_flavor" {
+  type        = string
+  description = "Allocated host flavor per member. [Learn more](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/database#host_flavor)."
+  default     = null
+}
+
 variable "service_credential_names" {
   description = "Map of name, role for service credentials that you want to create for the database"
   type        = map(string)

solutions/secure/main.tf

@@ -74,10 +74,11 @@ module "elasticsearch" {
   kms_key_crn                   = local.kms_key_crn
   access_tags                   = var.access_tags
   tags                          = var.tags
-  members                       = var.members
-  member_memory_mb              = var.member_memory_mb
   admin_pass                    = var.admin_pass
   users                         = var.users
+  members                       = var.members
+  member_host_flavor            = var.member_host_flavor
+  member_memory_mb              = var.member_memory_mb
   member_disk_mb                = var.member_disk_mb
   member_cpu_count              = var.member_cpu_count
   auto_scaling                  = var.auto_scaling

solutions/secure/variables.tf

@@ -58,8 +58,8 @@ variable "members" {
 
 variable "member_memory_mb" {
   type        = number
-  description = "The memory per member that is allocated. For more information, see https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling"
-  default     = 1024
+  description = "Allocated memory per member. [Learn more](https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling)"
+  default     = 4096
 }
 
 variable "member_cpu_count" {
@@ -74,6 +74,18 @@ variable "member_disk_mb" {
   default     = 5120
 }
 
+# Use new hosting model for all DA
+variable "member_host_flavor" {
+  type        = string
+  description = "The host flavor per member. [Learn more](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/database#host_flavor)."
+  default     = "multitenant"
+  # Prevent null or "", require multitenant or a machine type
+  validation {
+    condition     = (length(var.member_host_flavor) > 0)
+    error_message = "Member host flavor must be specified. [Learn more](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/resources/database#host_flavor)."
+  }
+}
+
 variable "service_credential_names" {
   description = "The map of name, role for service credentials that you want to create for the database"
   type        = map(string)

tests/other_test.go

@@ -13,27 +13,6 @@ import (
 	"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testhelper"
 )
 
-func TestRunBasicExample(t *testing.T) {
-	t.Parallel()
-
-	options := testhelper.TestOptionsDefaultWithVars(&testhelper.TestOptions{
-		Testing:            t,
-		TerraformDir:       "examples/basic",
-		Prefix:             "es-test",
-		ResourceGroup:      resourceGroup,
-		BestRegionYAMLPath: regionSelectionPath,
-		CloudInfoService:   sharedInfoSvc,
-
-		TerraformVars: map[string]interface{}{
-			"elasticsearch_version": "8.12", // Always lock this test into the latest supported elasticsearch version
-		},
-	})
-
-	output, err := options.RunTestConsistency()
-	assert.Nil(t, err, "This should not have errored")
-	assert.NotNil(t, output, "Expected some output")
-}
-
 func TestRunCompleteExampleOtherVersion(t *testing.T) {
 	t.Parallel()