Merge branch 'main' of https://github.com/finos/git-proxy into 1150-vitest-migration-from-service

Author: jescalada

package-lock.json

@@ -52,7 +52,7 @@ export default class Proxy {
     const allowedList: Repo[] = await getRepos();
 
     defaultAuthorisedRepoList.forEach(async (x) => {
-      const found = allowedList.find((y) => y.project === x.project && x.name === y.name);
+      const found = allowedList.find((y) => y.url === x.url);
       if (!found) {
         const repo = await createRepo(x);
         await addUserCanPush(repo._id!, 'admin');

src/proxy/index.ts

@@ -20,23 +20,23 @@ import service from '../src/service';
 const TEST_DEFAULT_REPO = {
   url: 'https://github.com/finos/git-proxy.git',
   name: 'git-proxy',
-  project: 'finos/git-proxy',
+  project: 'finos',
   host: 'github.com',
   proxyUrlPrefix: '/github.com/finos/git-proxy.git',
 };
 
 const TEST_GITLAB_REPO = {
   url: 'https://gitlab.com/gitlab-community/meta.git',
   name: 'gitlab',
-  project: 'gitlab-community/meta',
+  project: 'gitlab-community',
   host: 'gitlab.com',
   proxyUrlPrefix: '/gitlab.com/gitlab-community/meta.git',
 };
 
 const TEST_UNKNOWN_REPO = {
   url: 'https://github.com/finos/fdc3.git',
   name: 'fdc3',
-  project: 'finos/fdc3',
+  project: 'finos',
   host: 'github.com',
   proxyUrlPrefix: '/github.com/finos/fdc3.git',
   fallbackUrlPrefix: '/finos/fdc3.git',
@@ -214,6 +214,31 @@ describe.skip('proxy express application', () => {
     expect(res2.status).toBe(200);
     expect(res2.text).toContain('Rejecting repo');
   }, 5000);
+
+  it('should create the default repo if it does not exist', async function () {
+    // Remove the default repo from the db and check it no longer exists
+    await cleanupRepo(TEST_DEFAULT_REPO.url);
+
+    const repo = await db.getRepoByUrl(TEST_DEFAULT_REPO.url);
+    expect(repo).toBeNull();
+
+    // Restart the proxy
+    await proxy.stop();
+    await proxy.start();
+
+    // Check that the default repo was created in the db
+    const repo2 = await db.getRepoByUrl(TEST_DEFAULT_REPO.url);
+    expect(repo2).not.toBeNull();
+
+    // Check that the default repo isn't duplicated on subsequent restarts
+    await proxy.stop();
+    await proxy.start();
+
+    const allRepos = await db.getRepos();
+    const matchingRepos = allRepos.filter((r) => r.url === TEST_DEFAULT_REPO.url);
+
+    expect(matchingRepos).toHaveLength(1);
+  });
 });
 
 describe('handleRefsErrorMessage', () => {