refactor: add method to get default storage paths for more flexibility

kubeshop · Nov 16, 2023 · 107f9b1 · 107f9b1
1 parent 69fb68a
commit 107f9b1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/packages/synchronizer/src/handlers/storageHandler.ts b/packages/synchronizer/src/handlers/storageHandler.ts
@@ -1,8 +1,10 @@
+import envPaths from 'env-paths';
 import {Document, parse} from 'yaml';
 import {mkdirp} from 'mkdirp';
 import {existsSync, readFileSync} from 'fs';
 import {readFile, writeFile} from 'fs/promises';
 import {dirname, join, normalize} from 'path';
+import {DEFAULT_STORAGE_CONFIG_FOLDER} from '../constants';
 
 export abstract class StorageHandler<TData> {
   constructor(private _storageFolderPath: string) {}
@@ -71,3 +73,7 @@ export abstract class StorageHandler<TData> {
     }
   }
 }
+
+export function getDefaultStorageConfigPaths(suffix = '') {
+  return envPaths(DEFAULT_STORAGE_CONFIG_FOLDER, {suffix});
+}
diff --git a/packages/synchronizer/src/handlers/storageHandlerAuth.ts b/packages/synchronizer/src/handlers/storageHandlerAuth.ts
@@ -1,6 +1,5 @@
-import envPaths from 'env-paths';
-import {StorageHandler} from './storageHandler.js';
-import {DEFAULT_STORAGE_CONFIG_FILE_AUTH, DEFAULT_STORAGE_CONFIG_FOLDER} from '../constants.js';
+import {StorageHandler, getDefaultStorageConfigPaths} from './storageHandler.js';
+import {DEFAULT_STORAGE_CONFIG_FILE_AUTH} from '../constants.js';
 import type {TokenSet} from './deviceFlowHandler.js';
 
 export type TokenType = 'Bearer' | 'ApiKey';
@@ -28,7 +27,7 @@ export class StorageHandlerAuth extends StorageHandler<StorageAuthFormat> {
   private _defaultFileName: string;
 
   constructor(
-    storageFolderPath: string = envPaths(DEFAULT_STORAGE_CONFIG_FOLDER, {suffix: ''}).config,
+    storageFolderPath: string = getDefaultStorageConfigPaths().config,
     defaultFileName: string = DEFAULT_STORAGE_CONFIG_FILE_AUTH
   ) {
     super(storageFolderPath);

diff --git a/packages/synchronizer/src/handlers/storageHandlerPolicy.ts b/packages/synchronizer/src/handlers/storageHandlerPolicy.ts
@@ -1,13 +1,11 @@
-import envPaths from 'env-paths';
 import {Document} from 'yaml';
-import {StorageHandler} from './storageHandler.js';
-import {DEFAULT_STORAGE_CONFIG_FOLDER} from '../constants.js';
+import {StorageHandler, getDefaultStorageConfigPaths} from './storageHandler.js';
 import type {ValidationConfig} from '@monokle/types';
 
 export type StoragePolicyFormat = ValidationConfig;
 
 export class StorageHandlerPolicy extends StorageHandler<StoragePolicyFormat> {
-  constructor(storageFolderPath: string = envPaths(DEFAULT_STORAGE_CONFIG_FOLDER, {suffix: ''}).cache) {
+  constructor(storageFolderPath: string = getDefaultStorageConfigPaths().cache) {
     super(storageFolderPath);
   }