@socialgouv/cdtn-elasticsearch 2.43.0 → 2.44.0

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.44.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.43.0...v2.44.0) (2024-06-04)
+
+### Features
+
+- **elasticsearch:** upgrade to v8 ([#1389](https://github.com/SocialGouv/cdtn-admin/issues/1389)) ([b1f8598](https://github.com/SocialGouv/cdtn-admin/commit/b1f85983fed17123990d9f3c0fc417ea7534c24c))
+
 # [2.43.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.42.8...v2.43.0) (2024-06-04)
 
 **Note:** Version bump only for package @socialgouv/cdtn-elasticsearch

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@socialgouv/cdtn-elasticsearch",
   "description": "SocialGouv - Code du travail numerique - Infrastructure - Elasticsearch",
-  "version": "2.43.0",
+  "version": "2.44.0",
   "babel": {
     "plugins": [
       "@babel/plugin-transform-modules-commonjs"
@@ -13,9 +13,6 @@
   },
   "license": "Apache-2.0",
   "main": "src/index.js",
-  "peerDependencies": {
-    "@elastic/elasticsearch": "7.x"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -44,5 +41,5 @@
   },
   "sideEffects": false,
   "types": "src/index.d.ts",
-  "gitHead": "b0fab0cc92887cba5f29fbc2ffb6201ec8558bc7"
+  "gitHead": "2b7f9e5974ebc7db3b48b234319b686f4af5c430"
 }

package/src/analysis.js

@@ -66,51 +66,51 @@ const analyzer = {
   // for all suggestion
   // see below, ngram from tokens
   autocomplete: {
-    filter: ["lowercase", "icu_folding"],
+    filter: ["lowercase", "asciifolding"],
     tokenizer: "autocomplete", //, "french_stop"]
   },
 
   // at search time, we only consider
   // the entire query (no ngrams)
   autocomplete_search: {
-    filter: "icu_folding",
     tokenizer: "lowercase",
+    filter: "asciifolding",
   },
 
   french: {
     filter: [
       "french_elision",
-      "icu_folding",
+      "asciifolding",
       "lowercase",
       "french_stop",
       "french_stemmer",
     ],
-    tokenizer: "icu_tokenizer",
+    tokenizer: "standard",
   },
 
   french_indexing: {
     char_filter: ["startwith"],
     filter: [
       "french_elision",
-      "icu_folding",
+      "asciifolding",
       "lowercase",
       "french_stop",
       "french_stemmer",
     ],
-    tokenizer: "icu_tokenizer",
+    tokenizer: "standard",
   },
 
   french_with_synonyms: {
     char_filter: ["html_strip"],
     filter: [
       "french_elision",
-      "icu_folding",
+      "asciifolding",
       "lowercase",
       "french_synonyms",
       "french_stop",
       "french_stemmer",
     ],
-    tokenizer: "icu_tokenizer",
+    tokenizer: "standard",
   },
 
   idcc_ape: {
@@ -122,8 +122,8 @@ const analyzer = {
   // (as opposite to match "in the middle")
   sugg_prefix: {
     char_filter: ["startwith"],
-    filter: ["lowercase", "icu_folding"],
-    tokenizer: "icu_tokenizer",
+    filter: ["lowercase", "asciifolding"],
+    tokenizer: "standard",
   },
 };
 

package/src/esClientUtils.js

@@ -3,7 +3,7 @@ const { logger } = require("@shared/utils");
 const { analyzer, char_filter, filter, tokenizer } = require("./analysis");
 
 async function createIndex({ client, indexName, mappings }) {
-  const { body } = await client.indices.exists({ index: indexName });
+  const body = await client.indices.exists({ index: indexName });
   if (body) {
     try {
       await client.indices.delete({ index: indexName });
@@ -38,7 +38,7 @@ async function createIndex({ client, indexName, mappings }) {
 }
 
 async function version({ client }) {
-  const { body } = await client.info();
+  const body = await client.info();
   logger.info(body.version.number);
 }
 
@@ -63,10 +63,8 @@ async function bulkIndexDocuments({ client, indexName, documents }) {
       ),
       index: indexName,
     });
-    if (resp.body.errors) {
-      const errorDocs = resp.body.items.filter(
-        (item) => item.index.status !== 201
-      );
+    if (resp.errors) {
+      const errorDocs = resp.items.filter((item) => item.index.status !== 201);
       throw new Error(`Error during indexing ${JSON.stringify(errorDocs)}`);
     }
     logger.info(`Index ${documents.length} documents.`);
@@ -89,7 +87,7 @@ async function indexDocumentsBatched({
 }
 
 async function deleteOldIndex({ client, patterns, timestamp }) {
-  const { body: indices } = await client.cat.indices({ format: "json" });
+  const indices = await client.cat.indices({ format: "json" });
 
   const IndicesToDelete = getIndicesToDelete(patterns, timestamp, indices);
   const pIndicesToDelete = IndicesToDelete.map(({ index }) =>