Просмотр исходного кода

update elasticsearch version configuration to support versions 7, 8, and 9

Yuki Takei 9 месяцев назад
Родитель
Сommit
fcb7f710c9

+ 1 - 1
apps/app/src/server/service/config-manager/config-definition.ts

@@ -437,7 +437,7 @@ export const CONFIG_DEFINITIONS = {
     envVarName: 'FILE_UPLOAD_TOTAL_LIMIT',
     envVarName: 'FILE_UPLOAD_TOTAL_LIMIT',
     defaultValue: Infinity,
     defaultValue: Infinity,
   }),
   }),
-  'app:elasticsearchVersion': defineConfig<number>({
+  'app:elasticsearchVersion': defineConfig<7|8|9>({
     envVarName: 'ELASTICSEARCH_VERSION',
     envVarName: 'ELASTICSEARCH_VERSION',
     defaultValue: 8,
     defaultValue: 8,
   }),
   }),

+ 1 - 1
apps/app/src/server/service/search-delegator/elasticsearch.ts

@@ -73,7 +73,7 @@ class ElasticsearchDelegator implements SearchDelegator<Data, ESTermsKey, ESQuer
     this.name = SearchDelegatorName.DEFAULT;
     this.name = SearchDelegatorName.DEFAULT;
     this.socketIoService = socketIoService;
     this.socketIoService = socketIoService;
 
 
-    const elasticsearchVersion: number = configManager.getConfig('app:elasticsearchVersion');
+    const elasticsearchVersion = configManager.getConfig('app:elasticsearchVersion');
 
 
     if (elasticsearchVersion !== 7 && elasticsearchVersion !== 8) {
     if (elasticsearchVersion !== 7 && elasticsearchVersion !== 8) {
       throw new Error('Unsupported Elasticsearch version. Please specify a valid number to \'ELASTICSEARCH_VERSION\'');
       throw new Error('Unsupported Elasticsearch version. Please specify a valid number to \'ELASTICSEARCH_VERSION\'');