Merge branch 'main' into 1299-awsCredentialProviders-c

Author: jescalada

src/db/file/pushes.ts

@@ -6,9 +6,6 @@ import { PushQuery } from '../types';
 
 const COMPACTION_INTERVAL = 1000 * 60 * 60 * 24; // once per day
 
-// these don't get coverage in tests as they have already been run once before the test
-/* istanbul ignore if */
-
 // export for testing purposes
 export let db: Datastore;
 if (process.env.NODE_ENV === 'test') {

test/processors/checkEmptyBranch.test.ts

@@ -1,5 +1,6 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { Action } from '../../src/proxy/actions';
+import { EMPTY_COMMIT_HASH } from '../../src/proxy/processors/constants';
 
 vi.mock('simple-git');
 vi.mock('fs');
@@ -55,7 +56,7 @@ describe('checkEmptyBranch', () => {
       action = new Action('1234567890', 'push', 'POST', 1234567890, 'test/repo');
       action.proxyGitPath = '/tmp/gitproxy';
       action.repoName = 'test-repo';
-      action.commitFrom = '0000000000000000000000000000000000000000';
+      action.commitFrom = EMPTY_COMMIT_HASH;
       action.commitTo = 'abcdef1234567890abcdef1234567890abcdef12';
       action.commitData = [];
     });

test/processors/getDiff.test.ts

@@ -6,6 +6,7 @@ import fc from 'fast-check';
 import { Action } from '../../src/proxy/actions';
 import { exec } from '../../src/proxy/processors/push-action/getDiff';
 import { CommitData } from '../../src/proxy/processors/types';
+import { EMPTY_COMMIT_HASH } from '../../src/proxy/processors/constants';
 
 describe('getDiff', () => {
   let tempDir: string;
@@ -40,7 +41,7 @@ describe('getDiff', () => {
     action.repoName = 'temp-test-repo';
     action.commitFrom = 'HEAD~1';
     action.commitTo = 'HEAD';
-    action.commitData = [{ parent: '0000000000000000000000000000000000000000' } as CommitData];
+    action.commitData = [{ parent: EMPTY_COMMIT_HASH } as CommitData];
 
     const result = await exec({}, action);
 
@@ -55,7 +56,7 @@ describe('getDiff', () => {
     action.repoName = 'temp-test-repo';
     action.commitFrom = 'HEAD~1';
     action.commitTo = 'HEAD';
-    action.commitData = [{ parent: '0000000000000000000000000000000000000000' } as CommitData];
+    action.commitData = [{ parent: EMPTY_COMMIT_HASH } as CommitData];
 
     const result = await exec({}, action);
 
@@ -106,7 +107,7 @@ describe('getDiff', () => {
 
     action.proxyGitPath = path.dirname(tempDir);
     action.repoName = path.basename(tempDir);
-    action.commitFrom = '0000000000000000000000000000000000000000';
+    action.commitFrom = EMPTY_COMMIT_HASH;
     action.commitTo = headCommit;
     action.commitData = [{ parent: parentCommit } as CommitData];
 
@@ -156,9 +157,7 @@ describe('getDiff', () => {
             action.repoName = 'temp-test-repo';
             action.commitFrom = from;
             action.commitTo = to;
-            action.commitData = [
-              { parent: '0000000000000000000000000000000000000000' } as CommitData,
-            ];
+            action.commitData = [{ parent: EMPTY_COMMIT_HASH } as CommitData];
 
             const result = await exec({}, action);
 

test/proxy.test.ts

@@ -102,9 +102,6 @@ describe.skip('Proxy Module TLS Certificate Loading', () => {
       close: vi.fn(),
     } as any);
 
-    process.env.NODE_ENV = 'test';
-    process.env.GIT_PROXY_HTTPS_SERVER_PORT = '8443';
-
     const ProxyClass = (await import('../src/proxy/index')).Proxy;
     proxyModule = new ProxyClass();
   });

test/testDb.test.ts

@@ -4,6 +4,7 @@ import { Repo, User } from '../src/db/types';
 import { Action } from '../src/proxy/actions/Action';
 import { Step } from '../src/proxy/actions/Step';
 import { AuthorisedRepo } from '../src/config/generated/config';
+import { EMPTY_COMMIT_HASH } from '../src/proxy/processors/constants';
 
 const TEST_REPO = {
   project: 'finos',
@@ -37,7 +38,7 @@ const TEST_PUSH = {
   autoApproved: false,
   autoRejected: false,
   commitData: [],
-  id: '0000000000000000000000000000000000000000__1744380874110',
+  id: `${EMPTY_COMMIT_HASH}__1744380874110`,
   type: 'push',
   method: 'get',
   timestamp: 1744380903338,
@@ -49,7 +50,7 @@ const TEST_PUSH = {
   userEmail: '[email protected]',
   lastStep: null,
   blockedMessage:
-    '\n\n\nGitProxy has received your push:\n\nhttp://localhost:8080/requests/0000000000000000000000000000000000000000__1744380874110\n\n\n',
+    '\n\n\nGitProxy has received your push:\n\nhttp://localhost:8080/requests/${EMPTY_COMMIT_HASH}__1744380874110\n\n\n',
   _id: 'GIMEz8tU2KScZiTz',
   attestation: null,
 };

test/testPush.test.ts

@@ -4,6 +4,7 @@ import * as db from '../src/db';
 import { Service } from '../src/service';
 import { Proxy } from '../src/proxy';
 import { Express } from 'express';
+import { EMPTY_COMMIT_HASH } from '../src/proxy/processors/constants';
 
 // dummy repo
 const TEST_ORG = 'finos';
@@ -32,7 +33,7 @@ const TEST_PUSH = {
   autoApproved: false,
   autoRejected: false,
   commitData: [],
-  id: '0000000000000000000000000000000000000000__1744380874110',
+  id: `${EMPTY_COMMIT_HASH}__1744380874110`,
   type: 'push',
   method: 'get',
   timestamp: 1744380903338,
@@ -44,7 +45,7 @@ const TEST_PUSH = {
   userEmail: TEST_EMAIL_2,
   lastStep: null,
   blockedMessage:
-    '\n\n\nGitProxy has received your push:\n\nhttp://localhost:8080/requests/0000000000000000000000000000000000000000__1744380874110\n\n\n',
+    '\n\n\nGitProxy has received your push:\n\nhttp://localhost:8080/requests/${EMPTY_COMMIT_HASH}__1744380874110\n\n\n',
   _id: 'GIMEz8tU2KScZiTz',
   attestation: null,
 };
@@ -128,8 +129,7 @@ describe('Push API', () => {
 
     it('should get 404 for unknown push', async () => {
       await loginAsApprover();
-      const commitId =
-        '0000000000000000000000000000000000000000__79b4d8953cbc324bcc1eb53d6412ff89666c241f';
+      const commitId = `${EMPTY_COMMIT_HASH}__79b4d8953cbc324bcc1eb53d6412ff89666c241f`;
       const res = await request(app).get(`/api/v1/push/${commitId}`).set('Cookie', `${cookie}`);
       expect(res.status).toBe(404);
     });