Merge pull request #251 from MikroElektronika/update/author-index

Fixed legacy es _type issue

Author: StrahinjaJacimovic

scripts/check_indexes.py

@@ -121,13 +121,13 @@ def str2bool(v):
                     # Assign correct URLs
                     assign_urls(indexed_item, gh_instance, es_instance)
                 print("%sOK: Asset \"%s\" download link is correct. - %s" % (es_instance.Colors.OKBLUE, indexed_item['source']['name'], indexed_item['source']['download_link']))
+
+            if 'ES_HOST_LEGACY' in os.environ and 'ES_USER_LEGACY' in os.environ and 'ES_PASSWORD_LEGACY':
+                if indexed_item['source']['name'] in legacy_packages:
+                    es_instance_legacy.update('necto_package', indexed_item['doc']['id'], indexed_item['source'], legacy_es=True)
+                    print("%sOK: \"%s\" indexed for legacy NECTO." % (es_instance_legacy.Colors.OKGREEN, indexed_item['source']['name']))
         except Exception as e:
             print(f'{es_instance.Colors.FAIL}Error for {indexed_item['source']['name']}: {e}')
 
-        if 'ES_HOST_LEGACY' in os.environ and 'ES_USER_LEGACY' in os.environ and 'ES_PASSWORD_LEGACY':
-            if indexed_item['source']['name'] in legacy_packages:
-                es_instance_legacy.update('necto_package', indexed_item['doc']['id'], indexed_item['source'])
-                print("%sOK: \"%s\" indexed for legacy NECTO." % (es_instance_legacy.Colors.OKGREEN, indexed_item['source']['name']))
-
     if err and args.log_only:
         sys.exit(-1)

scripts/classes/class_es.py

@@ -1,4 +1,4 @@
-import re, time
+import re, time, copy
 from elasticsearch import Elasticsearch
 from enum import Enum
 
@@ -73,15 +73,26 @@ def find_item(items, check):
         return False
 
     @staticmethod
-    def api_index(es: Elasticsearch, doc_index, doc_type, doc_id, doc_body):
+    def api_index(es: Elasticsearch, doc_index, doc_type, doc_id, doc_body, legacy_es=False):
         # Kibana v8 requires _type to be in body in order to have doc_type defined
-        doc_body['_type'] = '_doc'
-        return es.index(
-            index=doc_index,
-            doc_type=doc_type,
-            id=doc_id,
-            body=doc_body
-        )
+        # while Kibana v7 requires _type not to be in body
+        if legacy_es:
+            legacy_doc_body = copy.deepcopy(doc_body)
+            del legacy_doc_body['_type']
+            return es.index(
+                index=doc_index,
+                doc_type=doc_type,
+                id=doc_id,
+                body=legacy_doc_body
+            )
+        else:
+            doc_body['_type'] = '_doc'
+            return es.index(
+                index=doc_index,
+                doc_type=doc_type,
+                id=doc_id,
+                body=doc_body
+            )
 
     def __init__(self, es_host, es_user, es_password, index, token, retry=None):
         self.es_instance = self.init(es_host, es_user, es_password, retry)
@@ -120,8 +131,8 @@ def create(self, doc_type, doc_id, doc_body):
         else:
             print("%sINFO: Asset \"%s\" created. - %s" % (self.Colors.OKGREEN, doc_body['name'], doc_body['download_link']))
 
-    def update(self, doc_type, doc_id, doc_body):
-        response = self.api_index(self.es_instance, self.index, doc_type, doc_id, doc_body)
+    def update(self, doc_type, doc_id, doc_body, legacy_es=False):
+        response = self.api_index(self.es_instance, self.index, doc_type, doc_id, doc_body, legacy_es)
         if doc_type:
             if response['created'] and 'created' == response['result']:
                 print("%sWARNING: Asset \"%s\" created instead of updating. - %s" % (self.Colors.WARNING, doc_body['name'], doc_body['download_link']))