Custom Property Backend Support and list approved glossary terms (#13496)

openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java

@@ -354,6 +354,10 @@ public class ElasticSearchClient implements SearchClient {
       searchSourceBuilder.sort(request.getSortFieldParam(), SortOrder.fromString(request.getSortOrder()));
     }
 
+    if (request.getIndex().equalsIgnoreCase("glossary_term_search_index")) {
+      searchSourceBuilder.query(QueryBuilders.boolQuery().must(QueryBuilders.matchQuery("status", "Approved")));
+    }
+
     /* for performance reasons ElasticSearch doesn't provide accurate hits
     if we enable trackTotalHits parameter it will try to match every result, count and return hits
     however in most cases for search results an approximate value is good enough.
@@ -1498,7 +1502,6 @@ public class ElasticSearchClient implements SearchClient {
                 requestConfigBuilder
                     .setConnectTimeout(esConfig.getConnectionTimeoutSecs() * 1000)
                     .setSocketTimeout(esConfig.getSocketTimeoutSecs() * 1000));
-        //        return new RestHighLevelClient(restClientBuilder);
         return new RestHighLevelClientBuilder(restClient).setApiCompatibilityMode(true).build();
       } catch (Exception e) {
         LOG.error("Failed to create elastic search client ", e);

openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java

@@ -346,6 +346,10 @@ public class OpenSearchClient implements SearchClient {
       searchSourceBuilder.sort(request.getSortFieldParam(), SortOrder.fromString(request.getSortOrder()));
     }
 
+    if (request.getIndex().equalsIgnoreCase("glossary_term_search_index")) {
+      searchSourceBuilder.query(QueryBuilders.boolQuery().must(QueryBuilders.matchQuery("status", "Approved")));
+    }
+
     /* for performance reasons OpenSearch doesn't provide accurate hits
     if we enable trackTotalHits parameter it will try to match every result, count and return hits
     however in most cases for search results an approximate value is good enough.

openmetadata-service/src/main/resources/elasticsearch/en/container_index_mapping.json

@@ -220,7 +220,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "children": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/en/dashboard_index_mapping.json

@@ -228,7 +228,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "dataProducts": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/en/database_index_mapping.json

@@ -166,7 +166,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "owner": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/en/database_schema_index_mapping.json

@@ -144,7 +144,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "owner": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_index_mapping.json

@@ -134,7 +134,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "mlFeatures": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/en/pipeline_index_mapping.json

@@ -161,7 +161,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "owner": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/en/search_entity_index_mapping.json

@@ -362,7 +362,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "dataProducts": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json

@@ -434,7 +434,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "sourceUrl": {
         "type": "keyword"

openmetadata-service/src/main/resources/elasticsearch/en/table_index_mapping.json

@@ -346,7 +346,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "dataProducts": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/en/topic_index_mapping.json

@@ -130,7 +130,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "dataProducts": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/jp/container_index_mapping.json

@@ -165,7 +165,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "dataModel": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_index_mapping.json

@@ -131,7 +131,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "dataProducts": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/jp/database_index_mapping.json

@@ -141,7 +141,7 @@
             }
           },
           "extension": {
-            "type": "keyword"
+            "type": "object"
           },
           "state": {
             "type": "keyword"

openmetadata-service/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json

@@ -153,7 +153,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "owner": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_index_mapping.json

@@ -136,7 +136,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "mlFeatures": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/jp/search_entity_index_mapping.json

@@ -361,7 +361,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "lifeCycle": {
         "type": "object"

openmetadata-service/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json

@@ -436,7 +436,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "sourceUrl": {
         "type": "keyword"

openmetadata-service/src/main/resources/elasticsearch/jp/table_index_mapping.json

@@ -355,7 +355,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "dataProducts": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/jp/topic_index_mapping.json

@@ -286,6 +286,9 @@
           }
         }
       },
+      "extension": {
+        "type": "object"
+      },
       "dataProducts": {
         "properties": {
           "id": {

openmetadata-service/src/main/resources/elasticsearch/zh/container_index_mapping.json

@@ -218,7 +218,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "children": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_index_mapping.json

@@ -157,7 +157,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "dataProducts": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/zh/database_index_mapping.json

@@ -146,7 +146,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "owner": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json

@@ -129,7 +129,7 @@
           }
         },
         "extension": {
-          "type": "keyword"
+          "type": "object"
         },
         "owner": {
           "properties": {

openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_index_mapping.json

@@ -105,7 +105,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "mlFeatures": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/zh/search_entity_index_mapping.json

@@ -348,7 +348,7 @@
         "type": "object"
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "dataProducts": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json

@@ -423,7 +423,7 @@
         "type": "object"
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "sourceUrl": {
         "type": "keyword"

openmetadata-service/src/main/resources/elasticsearch/zh/table_index_mapping.json

@@ -333,7 +333,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "dataProducts": {
         "properties": {

openmetadata-service/src/main/resources/elasticsearch/zh/topic_index_mapping.json

@@ -107,7 +107,7 @@
         }
       },
       "extension": {
-        "type": "keyword"
+        "type": "object"
       },
       "dataProducts": {
         "properties": {