fix: fix for a bug with Elastic index (#125)

Author: in-1911

modules/elastic-index/main.tf

@@ -7,6 +7,9 @@ locals {
 resource "elasticstack_elasticsearch_index" "sample_index" {
   name                = var.elastic_index_name
   deletion_protection = false
+  mappings = jsonencode({ properties = {
+    for key, value in jsondecode(var.elastic_index_mapping) : value => { fields = { keyword = { ignore_above = 256, type = "keyword" } }, type = "text" }
+  } })
 }
 
 ## Upload sample data entries
@@ -18,7 +21,7 @@ resource "elasticstack_elasticsearch_index" "sample_index" {
 
 resource "shell_script" "elastic_index_entries" {
   count      = var.elastic_index_entries_file != null ? 1 : 0
-  depends_on = [elasticstack_elasticsearch_index.sample_index] #  shell_script.elastic_index
+  depends_on = [elasticstack_elasticsearch_index.sample_index]
   lifecycle_commands {
     create = <<-EOT
       set -e
@@ -35,7 +38,8 @@ resource "shell_script" "elastic_index_entries" {
   environment = {
     ELASTIC_URL          = var.elastic_service_binding.url
     ELASTIC_CACERT       = var.elastic_service_binding.ca_data_base64
-    ELASTIC_INDEX_NAME   = urlencode(elasticstack_elasticsearch_index.sample_index.name) # shell_script.elastic_index.output.index_name)
+    ELASTIC_INDEX_NAME   = urlencode(elasticstack_elasticsearch_index.sample_index.name)
+    ELASTIC_INDEX_ID     = elasticstack_elasticsearch_index.sample_index.id # Add dependency to force upload on index recreate
     ELASTIC_ENTRIES_FILE = var.elastic_index_entries_file
     MODULE_PATH          = path.module
   }

modules/elastic-index/scripts/elastic-index-utils.sh

@@ -79,7 +79,12 @@ function delete_index_entries() {
     --data '{"query": {"match_all": {}}}' \
     --cacert <(cat <<< "$ELASTIC_CACERT" | base64 -d)
      )
-    check_error "$OUTPUT"
+    check_error "$OUTPUT" "index_not_found_exception"
+    if [[ ! $(echo "$OUTPUT" | jq -r '.error?.type') ==  "index_not_found_exception" ]]; then
+        echo "Index already deleted"
+        exit 0
+    fi
+
     if [[ ! $(echo "$OUTPUT" | jq -r '. | .failures | length') == "0" ]]; then
         echo "$OUTPUT"
         exit 1
@@ -95,7 +100,9 @@ function check_error() {
     fi
 
     local error
-    error=$(echo "$1" | jq '.error')
+    local ignore_error_type
+    ignore_error_type="${2:-none}"
+    error=$(echo "$1" | jq --arg ignore "$ignore_error_type" '.error | select(.type != $ignore)')
     if [[ -n "$error" && ! "$error" == "null" ]]; then
         echo "$error" | jq
         exit 1

modules/elastic-index/variables.tf

@@ -14,6 +14,12 @@ variable "elastic_index_name" {
   default     = "sample-rag-app-content"
 }
 
+variable "elastic_index_mapping" {
+  description = "Mapping configuration for the Elastic index"
+  type        = string
+  default     = "{}"
+}
+
 variable "elastic_index_entries_file" {
   description = "Path to JSON file with content entries"
   type        = string

solutions/banking/main.tf

@@ -173,6 +173,7 @@ module "configure_elastic_index" {
   source                     = "../../modules/elastic-index"
   elastic_service_binding    = local.elastic_service_binding
   elastic_index_name         = local.elastic_index_name
+  elastic_index_mapping      = jsonencode(jsondecode(file("${path.module}/artifacts/watsonx.Assistant/elastic-search-skill.json")).search_settings.schema_mapping)
   elastic_index_entries_file = var.elastic_upload_sample_data ? "./artifacts/watsonx.Assistant/bank-loan-faqs.json" : null
   depends_on                 = [data.ibm_iam_auth_token.tokendata]
 }

tests/pr_test.go

@@ -170,7 +170,7 @@ func TestRunUpgradeExample(t *testing.T) {
 
 		options.IgnoreDestroys = testhelper.Exemptions{
 			List: []string{
-				"null_resource.discovery_file_upload",
+				"module.configure_discovery_project[0].null_resource.discovery_file_upload",
 			},
 		}