fix: small fixes around input DA variables

README.md

@@ -96,8 +96,8 @@ You need the following permissions to run this module.
 | <a name="input_backup_encryption_key_crn"></a> [backup\_encryption\_key\_crn](#input\_backup\_encryption\_key\_crn) | The CRN of a Hyper Protect Crypto Services use for encrypting the disk that holds deployment backups. There are limitation per region on the Hyper Protect Crypto Services and region for those services. See https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hpcs#use-hpcs-backups | `string` | `null` | no |
 | <a name="input_cbr_rules"></a> [cbr\_rules](#input\_cbr\_rules) | The list of context-based restriction rules to create. | <pre>list(object({<br/>    description = string<br/>    account_id  = string<br/>    rule_contexts = list(object({<br/>      attributes = optional(list(object({<br/>        name  = string<br/>        value = string<br/>    }))) }))<br/>    enforcement_mode = string<br/>  }))</pre> | `[]` | 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_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`. [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. [Learn more](https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-elser-embeddings-elasticsearch) | `bool` | `false` | 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' and 'enable\_elser\_model' is enabled. [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_existing_kms_instance_guid"></a> [existing\_kms\_instance\_guid](#input\_existing\_kms\_instance\_guid) | The GUID of a Hyper Protect Crypto Services or Key Protect instance for the CRN specified in `kms_key_crn` and `backup_encryption_key_crn`. Applies only if `kms_encryption_enabled` is true, `skip_iam_authorization_policy` is false, and you specify values for `kms_key_crn` or `backup_encryption_key_crn`. | `string` | `null` | no |
 | <a name="input_kms_encryption_enabled"></a> [kms\_encryption\_enabled](#input\_kms\_encryption\_enabled) | Whether to specify the keys used to encrypt data in the database. Specify `true` to identify the encryption keys. If set to `false`, the data is encrypted with randomly generated keys. [Learn more about Key Protect integration](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-key-protect). [Learn more about HPCS integration](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hpcs). | `bool` | `false` | no |
 | <a name="input_kms_key_crn"></a> [kms\_key\_crn](#input\_kms\_key\_crn) | The root key CRN of the Key Protect or Hyper Protect Crypto Services instance to use for disk encryption. Applies only if `kms_encryption_enabled` is true. | `string` | `null` | no |

examples/fscloud/variables.tf

@@ -111,6 +111,6 @@ variable "backup_encryption_key_crn" {
 
 variable "enable_elser_model" {
   type        = bool
-  description = "Set it to true to install and start the Elastic's Natural Language Processing model. [Learn more](https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-elser-embeddings-elasticsearch)"
+  description = "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)"
   default     = false
 }

ibm_catalog.json

@@ -111,10 +111,12 @@
                   ]
                 },
                 {
-                  "key": "use_existing_resource_group"
+                  "key": "use_existing_resource_group",
+                  "required": true
                 },
                 {
-                  "key": "resource_group_name"
+                  "key": "resource_group_name",
+                  "required": true
                 },
                 {
                   "key": "prefix"
@@ -177,6 +179,9 @@
                 {
                   "key": "name"
                 },
+                {
+                  "key": "existing_elasticsearch_instance_crn"
+                },
                 {
                   "key": "plan",
                   "options": [
@@ -209,17 +214,40 @@
                   ]
                 },
                 {
-                  "key": "access_tags"
+                  "key": "enable_elser_model"
                 },
                 {
-                  "key": "use_ibm_owned_encryption_key"
+                  "key": "elser_model_type",
+                  "options": [
+                    {
+                      "displayname": ".elser_model_1",
+                      "value": ".elser_model_1"
+                    },
+                    {
+                      "displayname": ".elser_model_2",
+                      "value": ".elser_model_2"
+                    },
+                    {
+                      "displayname": ".elser_model_2_linux-x86_64",
+                      "value": ".elser_model_2_linux-x86_64"
+                    }
+                  ]
+                },
+                {
+                  "key": "access_tags"
                 },
                 {
                   "key": "tags"
                 },
                 {
                   "key": "users"
                 },
+                {
+                  "key": "service_credential_names"
+                },
+                {
+                  "key": "admin_pass"
+                },
                 {
                   "key": "members"
                 },
@@ -236,80 +264,56 @@
                   "key": "member_host_flavor"
                 },
                 {
-                  "key": "service_credential_names"
-                },
-                {
-                  "key": "admin_pass"
-                },
-                {
-                  "key": "admin_pass_sm_secret_group"
-                },
-                {
-                  "key": "use_existing_admin_pass_sm_secret_group"
-                },
-                {
-                  "key": "admin_pass_sm_secret_name"
+                  "key": "auto_scaling"
                 },
                 {
-                  "key": "skip_iam_authorization_policy"
+                  "key": "admin_pass_secrets_manager_secret_group"
                 },
                 {
-                  "key": "kms_endpoint_type",
-                  "options": [
-                    {
-                      "displayname": "public",
-                      "value": "public"
-                    },
-                    {
-                      "displayname": "private",
-                      "value": "private"
-                    }
-                  ]
+                  "key": "use_existing_admin_pass_secrets_manager_secret_group"
                 },
                 {
-                  "key": "existing_kms_key_crn"
+                  "key": "admin_pass_secrets_manager_secret_name"
                 },
                 {
-                  "key": "existing_kms_instance_crn",
-                  "required": true
+                  "key": "existing_secrets_manager_instance_crn"
                 },
                 {
-                  "key": "elasticsearch_key_ring_name"
+                  "key": "existing_secrets_manager_endpoint_type"
                 },
                 {
-                  "key": "elasticsearch_key_name"
+                  "key": "skip_elasticsearch_to_secrets_manager_auth_policy"
                 },
                 {
-                  "key": "auto_scaling"
+                  "key": "service_credential_secrets"
                 },
                 {
-                  "key": "backup_crn"
+                  "key": "skip_iam_authorization_policy"
                 },
+                  {
+                    "key": "kms_endpoint_type",
+                    "options": [
+                      {
+                        "displayname": "public",
+                        "value": "public"
+                      },
+                      {
+                        "displayname": "private",
+                        "value": "private"
+                      }
+                    ]
+                  },
                 {
-                  "key": "existing_backup_kms_key_crn"
+                  "key": "existing_kms_key_crn"
                 },
                 {
-                  "key": "existing_backup_kms_instance_crn"
+                  "key": "existing_kms_instance_crn"
                 },
                 {
-                  "key": "enable_elser_model"
+                  "key": "elasticsearch_key_ring_name"
                 },
                 {
-                  "key": "elser_model_type",
-                  "options": [
-                    {
-                      "displayname": ".elser_model_1",
-                      "value": ".elser_model_1"
-                    },
-                    {
-                      "displayname": ".elser_model_2",
-                      "value": ".elser_model_2"
-                    },
-                    {
-                      "displayname": ".elser_model_2_linux-x86_64",
-                      "value": ".elser_model_2_linux-x86_64"
-                    }
-                  ]
+                  "key": "elasticsearch_key_name"
                 }
               ]
           }

modules/fscloud/README.md

@@ -37,8 +37,8 @@ No resources.
 | <a name="input_backup_encryption_key_crn"></a> [backup\_encryption\_key\_crn](#input\_backup\_encryption\_key\_crn) | The Hyper Protect Crypto Services (HPCS) or Key Protect root key CRN to use for encrypting the disk that holds deployment backups. There are region limitations for backup encryption. See https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hpcs#use-hpcs-backups (HPCS) and https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-key-protect&interface=ui#key-byok (Key Protect). | `string` | `null` | no |
 | <a name="input_cbr_rules"></a> [cbr\_rules](#input\_cbr\_rules) | (Optional, list) List of CBR rules to create | <pre>list(object({<br/>    description = string<br/>    account_id  = string<br/>    rule_contexts = list(object({<br/>      attributes = optional(list(object({<br/>        name  = string<br/>        value = string<br/>    }))) }))<br/>    enforcement_mode = string<br/>  }))</pre> | `[]` | no |
 | <a name="input_elasticsearch_version"></a> [elasticsearch\_version](#input\_elasticsearch\_version) | Version of the Elasticsearch instance. If no value is passed, the current preferred version of 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`. [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. [Learn more](https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-elser-embeddings-elasticsearch) | `bool` | `false` | 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' and 'enable\_elser\_model' is enabled. [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_existing_kms_instance_guid"></a> [existing\_kms\_instance\_guid](#input\_existing\_kms\_instance\_guid) | The GUID of the Hyper Protect Crypto Services (HPCS) or Key Protect instance. | `string` | `null` | no |
 | <a name="input_kms_key_crn"></a> [kms\_key\_crn](#input\_kms\_key\_crn) | The Hyper Protect Crypto Services (HPCS) or Key Protect root key CRN to use for disk encryption. | `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. [Learn more](https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-resources-scaling) | `number` | `0` | no |

modules/fscloud/variables.tf

@@ -198,13 +198,13 @@ variable "backup_crn" {
 
 variable "enable_elser_model" {
   type        = bool
-  description = "Set it to true to install and start the Elastic's Natural Language Processing model. [Learn more](https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-elser-embeddings-elasticsearch)"
+  description = "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)"
   default     = false
 }
 
 variable "elser_model_type" {
   type        = string
-  description = "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`. [Learn more](https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-elser.html)"
+  description = "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' and 'enable_elser_model' is enabled. [Learn more](https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-elser.html)"
   default     = ".elser_model_2_linux-x86_64"
   validation {
     condition     = contains([".elser_model_1", ".elser_model_2", ".elser_model_2_linux-x86_64"], var.elser_model_type)