Merge branch 'main' into data-read-fix

Author: shemau

README.md

@@ -100,7 +100,7 @@ You need the following permissions to run this module.
 | <a name="input_cpu_count"></a> [cpu\_count](#input\_cpu\_count) | Allocated dedicated CPU per member. For shared CPU, set to 0. [Learn more](https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling). | `number` | `0` | no |
 | <a name="input_deletion_protection"></a> [deletion\_protection](#input\_deletion\_protection) | Enable deletion protection within terraform. This is not a property of the resource and does not prevent deletion outside of terraform. The database can not be deleted by terraform when this value is set to 'true'. In order to delete with terraform the value must be set to 'false' and a terraform apply performed before the destroy is performed. The default is 'true'. | `bool` | `true` | no |
 | <a name="input_disk_mb"></a> [disk\_mb](#input\_disk\_mb) | The disk that is allocated per member. [Learn more](https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling). | `number` | `5120` | no |
-| <a name="input_elasticsearch_version"></a> [elasticsearch\_version](#input\_elasticsearch\_version) | The version of Databases for Elasticsearch to deploy. Possible values: `8.7`, `8.10`, `8.12`, `8.15` which requires an Enterprise Platinum pricing plan. If no value is specified, the current preferred version for IBM Cloud Databases is used. | `string` | `null` | no |
+| <a name="input_elasticsearch_version"></a> [elasticsearch\_version](#input\_elasticsearch\_version) | The version of Databases for Elasticsearch to deploy. Possible values: `8.7`, `8.10`, `8.12`, `8.15`, `8.19`, `9.1` which requires an Enterprise Platinum pricing plan. If no value is specified, the current preferred version for IBM Cloud Databases is used. | `string` | `null` | no |
 | <a name="input_elser_model_type"></a> [elser\_model\_type](#input\_elser\_model\_type) | Trained ELSER model to be used for Elastic's Natural Language Processing. Possible values: `.elser_model_1`, `.elser_model_2` and `.elser_model_2_linux-x86_64`. Applies only if also 'plan' is set to 'platinum'. [Learn more](https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-elser.html) | `string` | `".elser_model_2_linux-x86_64"` | no |
 | <a name="input_enable_elser_model"></a> [enable\_elser\_model](#input\_enable\_elser\_model) | Set it to true to install and start the Elastic's Natural Language Processing model. Applies only if also 'plan' is set to 'platinum'. [Learn more](https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-elser-embeddings-elasticsearch) | `bool` | `false` | no |
 | <a name="input_kms_key_crn"></a> [kms\_key\_crn](#input\_kms\_key\_crn) | The CRN of a Key Protect or Hyper Protect Crypto Services encryption key to encrypt your data. Applies only if `use_ibm_owned_encryption_key` is false. By default this key is used for both deployment data and backups, but this behaviour can be altered using the `use_same_kms_key_for_backups` and `backup_encryption_key_crn` inputs. Bare in mind that backups encryption is only available in certain regions. See [Bring your own key for backups](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-key-protect&interface=ui#key-byok) and [Using the HPCS Key for Backup encryption](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hpcs#use-hpcs-backups). | `string` | `null` | no |

ibm_catalog.json

@@ -207,8 +207,16 @@
             {
               "key": "elasticsearch_version",
               "required": true,
-              "default_value": "8.15",
+              "default_value": "8.19",
               "options": [
+                {
+                  "displayname": "9.1",
+                  "value": "9.1"
+                },
+                {
+                  "displayname": "8.19",
+                  "value": "8.19"
+                },
                 {
                   "displayname": "8.15",
                   "value": "8.15"
@@ -716,8 +724,16 @@
             {
               "key": "elasticsearch_version",
               "required": true,
-              "default_value": "8.15",
+              "default_value": "8.19",
               "options": [
+                {
+                  "displayname": "9.1",
+                  "value": "9.1"
+                },
+                {
+                  "displayname": "8.19",
+                  "value": "8.19"
+                },
                 {
                   "displayname": "8.15",
                   "value": "8.15"

tests/pr_test.go

@@ -29,7 +29,7 @@ const completeExampleTerraformDir = "examples/complete"
 const fscloudExampleTerraformDir = "examples/fscloud"
 const fullyConfigurableSolutionTerraformDir = "solutions/fully-configurable"
 const securityEnforcedSolutionTerraformDir = "solutions/security-enforced"
-const latestVersion = "8.15"
+const latestVersion = "9.1"
 
 // Use existing resource group
 const resourceGroup = "geretain-test-elasticsearch"

variables.tf

@@ -14,7 +14,7 @@ variable "name" {
 
 variable "elasticsearch_version" {
   type        = string
-  description = "The version of Databases for Elasticsearch to deploy. Possible values: `8.7`, `8.10`, `8.12`, `8.15` which requires an Enterprise Platinum pricing plan. If no value is specified, the current preferred version for IBM Cloud Databases is used."
+  description = "The version of Databases for Elasticsearch to deploy. Possible values: `8.7`, `8.10`, `8.12`, `8.15`, `8.19`, `9.1` which requires an Enterprise Platinum pricing plan. If no value is specified, the current preferred version for IBM Cloud Databases is used."
   default     = null
 
   validation {
@@ -23,9 +23,11 @@ variable "elasticsearch_version" {
       var.elasticsearch_version == "8.7",
       var.elasticsearch_version == "8.10",
       var.elasticsearch_version == "8.12",
-      var.elasticsearch_version == "8.15"
+      var.elasticsearch_version == "8.15",
+      var.elasticsearch_version == "8.19",
+      var.elasticsearch_version == "9.1",
     ])
-    error_message = "Version must be 8.7, 8.10, 8.12 or 8.15 (Enterprise or Platinum plan if 8.10 or later)."
+    error_message = "Version must be 8.7, 8.10, 8.12, 8.15, 8.19 or 9.1 (Enterprise or Platinum plan if 8.10 or later)."
   }
 }