@cumulus/es-client 12.0.0 → 13.0.0

package/bootstrap.js

@@ -56,7 +56,7 @@ async function findMissingMappings(esClient, index, newMappings) {
   });
 }
 
-async function removeIndexAsAlias(esClient, alias) {
+async function removeIndexAsAlias(esClient, alias, removeAliasConflict) {
   // If the alias already exists as an index, remove it
   // We can't do a simple exists check here, because it'll return true if the alias
   // is actually an alias assigned to an index. We do a get and check that the alias
@@ -67,7 +67,11 @@ async function removeIndexAsAlias(esClient, alias) {
   );
 
   if (existingIndex && existingIndex[alias]) {
-    logger.info(`Deleting alias as index: ${alias}`);
+    logger.warn(`Conflicting index for alias ${alias} detected!`);
+    if (!removeAliasConflict) {
+      throw new Error('Aborting ES recreation as configuration does not allow removal of index');
+    }
+    logger.warn(`Deleting alias as index: ${alias}`);
     await esClient.indices.delete({ index: alias });
   }
 }
@@ -76,12 +80,21 @@ async function removeIndexAsAlias(esClient, alias) {
  * Initialize elastic search. If the index does not exist, create it with an alias.
  * If an index exists but is not aliased, alias the index.
  *
- * @param {string} host - elastic search host
- * @param {string} index - name of the index to create if does not exist, defaults to 'cumulus'
- * @param {string} alias - alias name for the index, defaults to 'cumulus'
+ * @param {Object} params
+ * @param {string} params.host                 - elastic search host
+ * @param {string} params.index                - name of the index to create if does not exist,
+ *                                               defaults to 'cumulus'
+ * @param {string} params.alias                - alias name for the index, defaults to 'cumulus'
+ * @param {boolean} params.removeAliasConflict - Flag to allow/disallow deletion of conflicting
+ *                                               'cumulus-alias' index
  * @returns {Promise} undefined
  */
-async function bootstrapElasticSearch(host, index = 'cumulus', alias = defaultIndexAlias) {
+async function bootstrapElasticSearch({
+  host,
+  index = 'cumulus',
+  alias = defaultIndexAlias,
+  removeAliasConflict = true,
+}) {
   if (!host) return;
 
   const esClient = await Search.es(host);
@@ -93,7 +106,7 @@ async function bootstrapElasticSearch(host, index = 'cumulus', alias = defaultIn
     },
   });
 
-  await removeIndexAsAlias(esClient, alias);
+  await removeIndexAsAlias(esClient, alias, removeAliasConflict);
 
   let aliasedIndex = index;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/es-client",
-  "version": "12.0.0",
+  "version": "13.0.0",
   "description": "Utilities for working with Elasticsearch",
   "keywords": [
     "CUMULUS",
@@ -30,10 +30,10 @@
   "author": "Cumulus Authors",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cumulus/common": "12.0.0",
-    "@cumulus/errors": "12.0.0",
-    "@cumulus/logger": "12.0.0",
-    "@cumulus/message": "12.0.0",
+    "@cumulus/common": "13.0.0",
+    "@cumulus/errors": "13.0.0",
+    "@cumulus/logger": "13.0.0",
+    "@cumulus/message": "13.0.0",
     "@elastic/elasticsearch": "^5.6.20",
     "aws-elasticsearch-connector": "8.2.0",
     "aws-sdk": "^2.585.0",
@@ -42,9 +42,9 @@
     "p-limit": "^1.2.0"
   },
   "devDependencies": {
-    "@cumulus/aws-client": "12.0.0",
-    "@cumulus/test-data": "12.0.0",
+    "@cumulus/aws-client": "13.0.0",
+    "@cumulus/test-data": "13.0.0",
     "p-each-series": "^2.1.0"
   },
-  "gitHead": "2d84198510f37d64444715736b8b08360f61c766"
+  "gitHead": "ba43ea3bfdfcacfff052770ed2fd357eb9dadb58"
 }

package/testUtils.js

@@ -8,7 +8,11 @@ const createTestIndex = async () => {
   const esIndex = randomString();
   const esAlias = randomString();
   process.env.ES_INDEX = esIndex;
-  await bootstrap.bootstrapElasticSearch('fakehost', esIndex, esAlias);
+  await bootstrap.bootstrapElasticSearch({
+    host: 'fakehost',
+    index: esIndex,
+    alias: esAlias,
+  });
   const esClient = await Search.es('fakehost');
   return { esIndex, esClient };
 };