fix: change mapServerCacheType to tilesStorageProvider

MapColonies · Sep 19, 2024 · 5e9e3f9 · 5e9e3f9
1 parent 6691544
commit 5e9e3f9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json
@@ -56,7 +56,7 @@
     "__name": "DISABLE_HTTP_CLIENT_LOGS",
     "__format": "boolean"
   },
-  "mapServerCacheType": "MAP_SERVER_CACHE_TYPE",
+  "tilesStorageProvider": "TILES_STORAGE_PROVIDER",
   "jobManagement": {
     "config": {
       "jobManagerBaseUrl": "JOB_MANAGER_BASE_URL",

diff --git a/config/default.json b/config/default.json
@@ -36,7 +36,7 @@
     "shouldResetTimeout": true
   },
   "disableHttpClientLogs": true,
-  "mapServerCacheType": "FS",
+  "tilesStorageProvider": "FS",
   "jobManagement": {
     "config": {
       "jobManagerBaseUrl": "http://localhost:8081",

diff --git a/src/task/models/tileMergeTaskManager.ts b/src/task/models/tileMergeTaskManager.ts
@@ -24,7 +24,7 @@ import { fileExtensionExtractor } from '../../utils/fileutils';
 
 @injectable()
 export class TileMergeTaskManager {
-  private readonly mapServerCacheType: string;
+  private readonly tilesStorageProvider: string;
   private readonly tileBatchSize: number;
   private readonly taskBatchSize: number;
   private readonly taskType: string;
@@ -34,7 +34,7 @@ export class TileMergeTaskManager {
     @inject(SERVICES.TILE_RANGER) private readonly tileRanger: TileRanger,
     @inject(SERVICES.QUEUE_CLIENT) private readonly queueClient: QueueClient
   ) {
-    this.mapServerCacheType = this.config.get<string>('mapServerCacheType');
+    this.tilesStorageProvider = this.config.get<string>('tilesStorageProvider');
     this.tileBatchSize = this.config.get<number>('jobManagement.ingestion.tasks.tilesMerging.tileBatchSize');
     this.taskBatchSize = this.config.get<number>('jobManagement.ingestion.tasks.tilesMerging.taskBatchSize');
     this.taskType = this.config.get<string>('jobManagement.ingestion.tasks.tilesMerging.type');
@@ -208,7 +208,7 @@ export class TileMergeTaskManager {
     const logger = this.logger.child({ partsLength: parts.length });
     logger.debug({ msg: 'Creating source layers', parts });
 
-    const sourceEntry: IMergeSources = { type: this.mapServerCacheType, path: destPath };
+    const sourceEntry: IMergeSources = { type: this.tilesStorageProvider, path: destPath };
     const sources = parts.map((part) => {
       const fileExtension = fileExtensionExtractor(part.fileName);
       return {

diff --git a/tests/unit/mocks/configMock.ts b/tests/unit/mocks/configMock.ts
@@ -73,13 +73,13 @@ const registerDefaultConfig = (): void => {
           options: null,
         },
       },
-      httpRetry: {
-        attempts: 5,
-        delay: 'exponential',
-        shouldResetTimeout: true,
-      },
-      disableHttpClientLogs: true,
     },
+    httpRetry: {
+      attempts: 5,
+      delay: 'exponential',
+      shouldResetTimeout: true,
+    },
+    disableHttpClientLogs: true,
     jobManagement: {
       config: {
         jobManagerBaseUrl: 'http://job-manager',