Merge fe7ca1b into 3e61538

Author: wphyojpl

cumulus_lambda_functions/daac_archiver/daac_archiver_logic.py

@@ -105,7 +105,7 @@ def send_to_daac_internal(self, uds_cnm_json: dict):
             LOGGER.debug(f'uds_cnm_json is not configured for archival. uds_cnm_json: {uds_cnm_json}')
             return
         daac_config = daac_config[0]  # TODO This is currently not supporting more than 1 daac.
-        result = JsonValidator(UdsArchiveConfigIndex.basic_schema).validate(daac_config)
+        result = JsonValidator(UdsArchiveConfigIndex.db_record_schema).validate(daac_config)
         if result is not None:
             raise ValueError(f'daac_config does not have valid schema. Pls re-add the daac config: {result} for {daac_config}')
         try:

cumulus_lambda_functions/granules_to_es/granules_indexer.py

@@ -78,8 +78,12 @@ def start(self):
             return
         self.__cumulus_record = incoming_msg['record']
         if len(self.__cumulus_record['files']) < 1:
+            LOGGER.debug(f'No files in cumulus record. Not inserting to ES')
             # TODO ingest updating stage?
             return
+        if 'status' not in self.__cumulus_record or self.__cumulus_record['status'].upper() != 'COMPLETED':
+            LOGGER.debug(f'missing status or it is NOT COMPLETED status. Not inserting to ES')
+            return
         stac_input_meta = None
         potential_files = self.__get_potential_files()
         LOGGER.debug(f'potential_files: {potential_files}')

cumulus_lambda_functions/lib/uds_db/archive_index.py

@@ -29,6 +29,23 @@ class UdsArchiveConfigIndex:
         }
     }
 
+    db_record_schema = {
+        'type': 'object',
+        'required': ['daac_collection_name', 'daac_sns_topic_arn', 'daac_data_version', 'daac_role_arn',
+                     'daac_role_session_name',
+                     'collection', 'ss_username', 'archiving_types'],
+        'properties': {
+            'daac_collection_name': {'type': 'string'},
+            'daac_sns_topic_arn': {'type': 'string'},
+            'daac_data_version': {'type': 'string'},
+            'daac_role_arn': {'type': 'string'},
+            'daac_role_session_name': {'type': 'string'},
+            'collection': {'type': 'string'},
+            'ss_username': {'type': 'string'},
+            'archiving_types': {'type': 'array', 'items': {'type': 'object'}},
+        }
+    }
+
     def __init__(self, es_url, es_port=443, es_type='AWS', use_ssl=True):
         self.__es: ESAbstract = ESFactory().get_instance(es_type,
                                                          index='TODO',