@cumulus/es-client 18.5.2 → 18.5.3

package/indexer.js

@@ -26,6 +26,10 @@ const mappings = require('./config/mappings.json');
 
 const logger = new Logger({ sender: '@cumulus/es-client/indexer' });
 
+/**
+ * @typedef {import('@cumulus/types').ApiGranule} ApiGranule
+ */
+
 async function createIndex(esClient, indexName) {
   const indexExists = await esClient.client.indices.exists({ index: indexName })
     .then((response) => response.body);
@@ -90,7 +94,7 @@ async function genericRecordUpdate(esClient, id, doc, index, type, parent) {
     try {
       indexResponse = await actualEsClient.client.index(params);
     } catch (error) {
-      if (error.name === 'ResponseError' && error?.meta?.body?.message.includes('The security token included in the request is expired')) {
+      if (error.name === 'ResponseError' && error?.meta?.body?.message?.includes('The security token included in the request is expired')) {
         logger.warn(`genericRecordUpdate encountered a ResponseError ${JSON.stringify(error)}, updating credentials and retrying`);
         await actualEsClient.refreshClient();
         indexResponse = await actualEsClient.client.index(params);
@@ -108,14 +112,15 @@ async function genericRecordUpdate(esClient, id, doc, index, type, parent) {
 /**
  * Updates a given record for the Elasticsearch index and type
  *
- * @param  {Object} esClient - Elasticsearch Connection object
- * @param  {string} id       - the record id
- * @param  {Object} doc      - the record
- * @param  {string} index    - Elasticsearch index alias
- * @param  {string} type     - Elasticsearch type
+ * @param  {Object}             esClient - Elasticsearch Connection object
+ * @param  {string}             id       - the record id
+ * @param  {Object}             doc      - the record
+ * @param  {string}             index    - Elasticsearch index alias
+ * @param  {string}             type     - Elasticsearch type
+ * @param  {string | undefined} parent   - parent identifier if applicable
  * @returns {Promise} Elasticsearch response
  */
-async function updateExistingRecord(esClient, id, doc, index, type) {
+async function updateExistingRecord(esClient, id, doc, index, type, parent) {
   return await esClient.client.update({
     index,
     type,
@@ -127,6 +132,7 @@ async function updateExistingRecord(esClient, id, doc, index, type) {
       },
     },
     refresh: inTestMode(),
+    parent,
   });
 }
 
@@ -141,7 +147,23 @@ async function updateExistingRecord(esClient, id, doc, index, type) {
  * @returns {Promise} elasticsearch update response
  */
 function updateAsyncOperation(esClient, id, updates, index = defaultIndexAlias, type = 'asyncOperation') {
-  return updateExistingRecord(esClient, id, updates, index, type);
+  const parent = undefined;
+  return updateExistingRecord(esClient, id, updates, index, type, parent);
+}
+
+/**
+ * Updates a granule record in Elasticsearch
+ *
+ * @param  {Object}     esClient - Elasticsearch Connection object
+ * @param  {ApiGranule} granule - Api Granule to update
+ * @param  {Object}     updates - Updates to make to granule in Elasticsearch
+ * @param  {string}     index - Elasticsearch index alias (default defined in search.js)
+ * @param  {string}     type - Elasticsearch type (default: granule)
+ * @returns {Promise} elasticsearch update response
+ */
+function updateGranule(esClient, granule, updates, index = defaultIndexAlias, type = 'granule') {
+  const collectionId = granule.collectionId;
+  return updateExistingRecord(esClient, granule.granuleId, updates, index, type, collectionId);
 }
 
 const executionInvalidNullFields = [
@@ -821,4 +843,5 @@ module.exports = {
   upsertExecution,
   upsertGranule,
   upsertPdr,
+  updateGranule,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/es-client",
-  "version": "18.5.2",
+  "version": "18.5.3",
   "description": "Utilities for working with Elasticsearch",
   "keywords": [
     "CUMULUS",
@@ -34,10 +34,11 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@aws-sdk/credential-providers": "^3.621.0",
-    "@cumulus/common": "18.5.2",
-    "@cumulus/errors": "18.5.2",
-    "@cumulus/logger": "18.5.2",
-    "@cumulus/message": "18.5.2",
+    "@cumulus/common": "18.5.3",
+    "@cumulus/errors": "18.5.3",
+    "@cumulus/logger": "18.5.3",
+    "@cumulus/message": "18.5.3",
+    "@cumulus/types": "18.5.3",
     "@elastic/elasticsearch": "^5.6.20",
     "aws4": "^1.12.0",
     "lodash": "~4.17.21",
@@ -45,9 +46,9 @@
     "p-limit": "^1.2.0"
   },
   "devDependencies": {
-    "@cumulus/aws-client": "18.5.2",
-    "@cumulus/test-data": "18.5.2",
+    "@cumulus/aws-client": "18.5.3",
+    "@cumulus/test-data": "18.5.3",
     "p-each-series": "^2.1.0"
   },
-  "gitHead": "615196ec606ceb95334198cabbfb215d2fe71d66"
+  "gitHead": "710a2742b86966888094319920f57471b72a0cf8"
 }