Merge branch 'main' into 909-ldap-user-group-confirmation

Author: JamieSlome

README.md

@@ -23,7 +23,7 @@
 
   <br />
 
-[![FINOS - Incubating](https://cdn.jsdelivr.net/gh/finos/contrib-toolbox@master/images/badge-incubating.svg)](https://community.finos.org/docs/governance/Software-Projects/stages/incubating)
+[![FINOS - Active](https://cdn.jsdelivr.net/gh/finos/contrib-toolbox@master/images/badge-active.svg)](https://community.finos.org/docs/governance/Software-Projects/stages/active)
 [![NPM](https://img.shields.io/npm/v/@finos/git-proxy?colorA=00C586&colorB=000000)](https://www.npmjs.com/package/@finos/git-proxy)
 [![Build](https://img.shields.io/github/actions/workflow/status/finos/git-proxy/ci.yml?branch=main&label=CI&logo=github&colorA=00C586&colorB=000000)](https://github.com/finos/git-proxy/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/finos/git-proxy/branch/main/graph/badge.svg)](https://codecov.io/gh/finos/git-proxy)

test/ConfigLoader.test.js

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import path from 'path';
+import { configFile } from '../src/config/file';
 import { expect } from 'chai';
 import { ConfigLoader } from '../src/config/ConfigLoader';
 import { isValidGitUrl, isValidPath, isValidBranchName } from '../src/config/ConfigLoader';
@@ -23,6 +24,18 @@ describe('ConfigLoader', () => {
       fs.rmSync(tempDir, { recursive: true });
     }
     sinon.restore();
+    configLoader?.stop();
+  });
+
+  after(async () => {
+    // reset config to default after all tests have run
+    console.log(`Restoring config to defaults from file ${configFile}`);
+    configLoader = new ConfigLoader({});
+    await configLoader.loadFromFile({
+      type: 'file',
+      enabled: true,
+      path: configFile,
+    });
   });
 
   describe('loadFromFile', () => {
@@ -168,7 +181,7 @@ describe('ConfigLoader', () => {
 
   describe('initialize', () => {
     it('should initialize cache directory using env-paths', async () => {
-      const configLoader = new ConfigLoader({});
+      configLoader = new ConfigLoader({});
       await configLoader.initialize();
 
       // Check that cacheDir is set and is a string
@@ -190,7 +203,7 @@ describe('ConfigLoader', () => {
     });
 
     it('should create cache directory if it does not exist', async () => {
-      const configLoader = new ConfigLoader({});
+      configLoader = new ConfigLoader({});
       await configLoader.initialize();
 
       // Check if directory exists
@@ -214,7 +227,7 @@ describe('ConfigLoader', () => {
         },
       };
 
-      const configLoader = new ConfigLoader(mockConfig);
+      configLoader = new ConfigLoader(mockConfig);
       const spy = sinon.spy(configLoader, 'reloadConfiguration');
       await configLoader.start();
 
@@ -235,7 +248,7 @@ describe('ConfigLoader', () => {
         },
       };
 
-      const configLoader = new ConfigLoader(mockConfig);
+      configLoader = new ConfigLoader(mockConfig);
       configLoader.reloadTimer = setInterval(() => {}, 1000);
       await configLoader.start();
 
@@ -257,7 +270,7 @@ describe('ConfigLoader', () => {
         },
       };
 
-      const configLoader = new ConfigLoader(mockConfig);
+      configLoader = new ConfigLoader(mockConfig);
       const spy = sinon.spy(configLoader, 'reloadConfiguration');
       await configLoader.start();
 
@@ -281,7 +294,7 @@ describe('ConfigLoader', () => {
         },
       };
 
-      const configLoader = new ConfigLoader(mockConfig);
+      configLoader = new ConfigLoader(mockConfig);
       configLoader.reloadTimer = setInterval(() => {}, 1000);
       expect(configLoader.reloadTimer).to.not.be.null;
 
@@ -291,7 +304,6 @@ describe('ConfigLoader', () => {
   });
 
   describe('loadRemoteConfig', () => {
-    let configLoader;
     beforeEach(async () => {
       const configFilePath = path.join(__dirname, '..', 'proxy.config.json');
       const config = JSON.parse(fs.readFileSync(configFilePath, 'utf-8'));
@@ -379,7 +391,7 @@ describe('ConfigLoader', () => {
         branch: 'main',
         enabled: true,
       };
-      
+
       try {
         await configLoader.loadFromSource(source);
         throw new Error('Expected error was not thrown');