upgrade elasticsearch 7.10

MTES-MCT · Jun 28, 2023 · 0663265 · 0663265
1 parent 949f6f6
commit 0663265
Show file tree

Hide file tree

Showing 19 changed files with 8,923 additions and 27,538 deletions.
diff --git a/back/integration-tests/docker-compose.yml b/back/integration-tests/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - net.core.somaxconn=511
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.8.0
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
     restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
     environment:
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"

diff --git a/back/package-lock.json b/back/package-lock.json
diff --git a/back/package.json b/back/package.json
@@ -61,7 +61,7 @@
     "@aws-sdk/lib-storage": "^3.359.0",
     "@bull-board/api": "^4.12.2",
     "@bull-board/express": "^4.12.2",
-    "@elastic/elasticsearch": "^7.17.0",
+    "@elastic/elasticsearch": "7.13",
     "@fast-csv/format": "^4.3.0",
     "@graphql-tools/load-files": "^6.6.1",
     "@graphql-tools/merge": "^8.4.0",

diff --git a/back/prisma/scripts/reindexTransporterInfo.ts b/back/prisma/scripts/reindexTransporterInfo.ts
@@ -35,6 +35,6 @@ export class ReindexTransporterInfo implements Updater {
       ...bsdas.map(bsda => bsdaToBsdElastic(bsda)),
       ...bsdasris.map(bsdasri => bsdasriToBsdElastic(bsdasri)),
       ...bsffs.map(bsff => bsffToBsdElastic(bsff))
-    ]);
+    ], index.elasticSearchUrl);
   }
 }
diff --git a/back/src/bsds/__tests__/where.integration.ts b/back/src/bsds/__tests__/where.integration.ts
@@ -29,7 +29,7 @@ describe("StringFilter to elastic query", () => {
       }
     ];
 
-    await indexBsds(index.alias, bsds as any);
+    await indexBsds(index.alias, bsds as any, index.elasticSearchUrl);
     await refreshElasticSearch();
   });
 
@@ -177,7 +177,7 @@ describe("TextFilter to elastic query", () => {
       }
     ];
 
-    await indexBsds(index.alias, bsds as any);
+    await indexBsds(index.alias, bsds as any, index.elasticSearchUrl);
     await refreshElasticSearch();
   });
 
@@ -307,7 +307,7 @@ describe("StringNullableFilter to elastic query", () => {
       }
     ];
 
-    await indexBsds(index.alias, bsds as any);
+    await indexBsds(index.alias, bsds as any, index.elasticSearchUrl);
     await refreshElasticSearch();
   });
 
@@ -482,7 +482,7 @@ describe("DateFilter to elastic query", () => {
       }
     ];
 
-    await indexBsds(index.alias, bsds as any);
+    await indexBsds(index.alias, bsds as any, index.elasticSearchUrl);
     await refreshElasticSearch();
   });
 
@@ -573,7 +573,7 @@ describe("Compound filter to elastic query", () => {
       }
     ];
 
-    await indexBsds(index.alias, bsds as any);
+    await indexBsds(index.alias, bsds as any, index.elasticSearchUrl);
     await refreshElasticSearch();
   });
 
@@ -749,7 +749,7 @@ describe("search on readableId", () => {
       }
     ];
 
-    await indexBsds(index.alias, bsds as any);
+    await indexBsds(index.alias, bsds as any, index.elasticSearchUrl);
     await refreshElasticSearch();
   });
 
@@ -786,7 +786,7 @@ describe("search on wasteCode", () => {
       }
     ];
 
-    await indexBsds(index.alias, bsds as any);
+    await indexBsds(index.alias, bsds as any, index.elasticSearchUrl);
     await refreshElasticSearch();
   });
 

diff --git a/back/src/bsds/indexation/__tests__/bulkIndexBsds.integration.ts b/back/src/bsds/indexation/__tests__/bulkIndexBsds.integration.ts
@@ -12,7 +12,7 @@ import { formFactory, userFactory } from "../../../__tests__/factories";
 import {
   getBsdIdentifiers,
   indexAllBsds,
-  indexAllBsdTypeConcurrently,
+  indexAllBsdTypeConcurrentJobs,
   indexAllBsdTypeSync,
   processBsdIdentifiersByChunk
 } from "../bulkIndexBsds";
@@ -70,7 +70,7 @@ describe("indexAllBsdTypeSync", () => {
       formFactory({ ownerId: user.id })
     ]);
 
-    await indexAllBsdTypeSync({ bsdName: "bsdd", index: index.alias });
+    await indexAllBsdTypeSync({ bsdName: "bsdd", index: index.alias, indexConfig: index });
     await refreshElasticSearch();
 
     const { body }: ApiResponse<SearchResponse<BsdElastic>> =
@@ -94,7 +94,7 @@ describe("indexAllBsdTypeSync", () => {
       bsdaFactory({})
     ]);
 
-    await indexAllBsdTypeSync({ bsdName: "bsda", index: index.alias });
+    await indexAllBsdTypeSync({ bsdName: "bsda", index: index.alias, indexConfig: index });
     await refreshElasticSearch();
 
     const { body }: ApiResponse<SearchResponse<BsdElastic>> =
@@ -118,7 +118,7 @@ describe("indexAllBsdTypeSync", () => {
       bsdasriFactory({})
     ]);
 
-    await indexAllBsdTypeSync({ bsdName: "bsdasri", index: index.alias });
+    await indexAllBsdTypeSync({ bsdName: "bsdasri", index: index.alias, indexConfig: index });
     await refreshElasticSearch();
 
     const { body }: ApiResponse<SearchResponse<BsdElastic>> =
@@ -142,7 +142,7 @@ describe("indexAllBsdTypeSync", () => {
       createBsff({})
     ]);
 
-    await indexAllBsdTypeSync({ bsdName: "bsff", index: index.alias });
+    await indexAllBsdTypeSync({ bsdName: "bsff", index: index.alias, indexConfig: index });
     await refreshElasticSearch();
 
     const { body }: ApiResponse<SearchResponse<BsdElastic>> =
@@ -165,7 +165,7 @@ describe("indexAllBsdTypeSync", () => {
       bsvhuFactory({}),
       bsvhuFactory({})
     ]);
-    await indexAllBsdTypeSync({ bsdName: "bsvhu", index: index.alias });
+    await indexAllBsdTypeSync({ bsdName: "bsvhu", index: index.alias, indexConfig: index });
     await refreshElasticSearch();
 
     const { body }: ApiResponse<SearchResponse<BsdElastic>> =
@@ -194,9 +194,10 @@ describe("indexAllBsdTypeConcurrently", () => {
       formFactory({ ownerId: user.id })
     ]);
 
-    const jobs = await indexAllBsdTypeConcurrently({
+    const jobs = await indexAllBsdTypeConcurrentJobs({
       bsdName: "bsdd",
-      index: index.alias
+      index: index.alias,
+      indexConfig: index
     });
     await refreshElasticSearch();
 
@@ -223,9 +224,10 @@ describe("indexAllBsdTypeConcurrently", () => {
       bsdaFactory({})
     ]);
 
-    const jobs = await indexAllBsdTypeConcurrently({
+    const jobs = await indexAllBsdTypeConcurrentJobs({
       bsdName: "bsda",
-      index: index.alias
+      index: index.alias,
+      indexConfig: index
     });
     await refreshElasticSearch();
 
@@ -252,9 +254,10 @@ describe("indexAllBsdTypeConcurrently", () => {
       bsdasriFactory({})
     ]);
 
-    const jobs = await indexAllBsdTypeConcurrently({
+    const jobs = await indexAllBsdTypeConcurrentJobs({
       bsdName: "bsdasri",
-      index: index.alias
+      index: index.alias,
+      indexConfig: index
     });
     await refreshElasticSearch();
 
@@ -281,9 +284,10 @@ describe("indexAllBsdTypeConcurrently", () => {
       createBsff({})
     ]);
 
-    const jobs = await indexAllBsdTypeConcurrently({
+    const jobs = await indexAllBsdTypeConcurrentJobs({
       bsdName: "bsff",
-      index: index.alias
+      index: index.alias,
+      indexConfig: index
     });
     await refreshElasticSearch();
 
@@ -309,9 +313,10 @@ describe("indexAllBsdTypeConcurrently", () => {
       bsvhuFactory({}),
       bsvhuFactory({})
     ]);
-    const jobs = await indexAllBsdTypeConcurrently({
+    const jobs = await indexAllBsdTypeConcurrentJobs({
       bsdName: "bsvhu",
-      index: index.alias
+      index: index.alias,
+      indexConfig: index
     });
     await refreshElasticSearch();
 
@@ -344,7 +349,7 @@ describe("indexAllBsds", () => {
     const bsvhu = await bsvhuFactory({});
     const bsds = [form, bsda, bsdasri, bsff, bsvhu];
 
-    await indexAllBsds(index.alias, false);
+    await indexAllBsds(index.alias, index, false);
     await refreshElasticSearch();
 
     const { body }: ApiResponse<SearchResponse<BsdElastic>> =
@@ -371,7 +376,7 @@ describe("indexAllBsds", () => {
     const bsvhu = await bsvhuFactory({});
     const bsds = [form, bsda, bsdasri, bsff, bsvhu];
 
-    await indexAllBsds(index.alias, true);
+    await indexAllBsds(index.alias, index, true);
     await refreshElasticSearch();
 
     const { body }: ApiResponse<SearchResponse<BsdElastic>> =