Merge branch 'main' into 1150-vitest-migration-from-service

Author: jescalada

package.json

@@ -29,6 +29,11 @@
       "import": "./dist/src/types/models.js",
       "require": "./dist/src/types/models.js",
       "types": "./dist/src/types/models.d.ts"
+    },
+    "./plugin": {
+      "import": "./dist/src/plugin.js",
+      "require": "./dist/src/plugin.js",
+      "types": "./dist/src/plugin.d.ts"
     }
   },
   "scripts": {

src/proxy/processors/pre-processor/parseAction.ts

@@ -9,24 +9,21 @@ const exec = async (req: {
 }) => {
   const id = Date.now();
   const timestamp = id;
-  const pathBreakdown = processUrlPath(req.originalUrl);
   let type = 'default';
-  if (pathBreakdown) {
-    if (pathBreakdown.gitPath.endsWith('git-upload-pack') && req.method === 'GET') {
-      type = 'pull';
-    } else if (
-      pathBreakdown.gitPath.includes('git-receive-pack') &&
-      req.method === 'POST' &&
-      req.headers['content-type'] === 'application/x-git-receive-pack-request'
-    ) {
-      type = 'push';
-    }
-  } // else failed to parse proxy URL path - which is logged in the parsing util
+
+  //inspect content-type headers to classify requests as push or pull operations
+  // see git http protocol docs for more details: https://github.com/git/git/blob/master/Documentation/gitprotocol-http.adoc
+  if (req.headers['content-type'] === 'application/x-git-upload-pack-request') {
+    type = 'pull';
+  } else if (req.headers['content-type'] === 'application/x-git-receive-pack-request') {
+    type = 'push';
+  }
 
   // Proxy URLs take the form https://<git proxy domain>:<port>/<proxied domain>/<repoPath>
   // e.g. https://git-proxy-instance.com:8443/github.com/finos/git-proxy.git
   // We'll receive /github.com/finos/git-proxy.git as the req.url / req.originalUrl
   // Add protocol (assume SSL) to reconstruct full URL - noting path will start with a /
+  const pathBreakdown = processUrlPath(req.originalUrl);
   let url = 'https:/' + (pathBreakdown?.repoPath ?? 'NOT-FOUND');
 
   console.log(`Parse action calculated repo URL: ${url} for inbound URL path: ${req.originalUrl}`);

test/plugin/plugin.test.ts

@@ -2,29 +2,25 @@ import { describe, it, expect, beforeAll, afterAll } from 'vitest';
 import { spawnSync } from 'child_process';
 import { rmSync } from 'fs';
 import { join } from 'path';
-import {
-  isCompatiblePlugin,
-  PullActionPlugin,
-  PushActionPlugin,
-  PluginLoader,
-} from '../../src/plugin';
+import { isCompatiblePlugin, PushActionPlugin, PluginLoader } from '../../src/plugin';
 
 const testPackagePath = join(__dirname, '../fixtures', 'test-package');
 
-// Temporarily skipping these until plugin loading is refactored to use ESM/TS
-describe.skip('loading plugins from packages', { timeout: 10000 }, () => {
+describe('loading plugins from packages', () => {
   beforeAll(() => {
     spawnSync('npm', ['install'], { cwd: testPackagePath, timeout: 5000 });
   });
 
   it(
     'should load plugins that are the default export (module.exports = pluginObj)',
     async () => {
-      const loader = new PluginLoader([join(testPackagePath, 'default-export.ts')]);
+      const loader = new PluginLoader([join(testPackagePath, 'default-export.js')]);
       await loader.load();
       expect(loader.pushPlugins.length).toBe(1);
       expect(loader.pushPlugins.every((p) => isCompatiblePlugin(p))).toBe(true);
-      expect(loader.pushPlugins[0]).toBeInstanceOf(PushActionPlugin);
+      expect(
+        loader.pushPlugins.every((p) => isCompatiblePlugin(p, 'isGitProxyPushActionPlugin')),
+      ).toBe(true);
     },
     { timeout: 10000 },
   );
@@ -43,8 +39,6 @@ describe.skip('loading plugins from packages', { timeout: 10000 }, () => {
       expect(
         loader.pullPlugins.every((p) => isCompatiblePlugin(p, 'isGitProxyPullActionPlugin')),
       ).toBe(true);
-      expect(loader.pushPlugins[0]).toBeInstanceOf(PushActionPlugin);
-      expect(loader.pullPlugins[0]).toBeInstanceOf(PullActionPlugin);
     },
     { timeout: 10000 },
   );
@@ -59,7 +53,6 @@ describe.skip('loading plugins from packages', { timeout: 10000 }, () => {
       expect(
         loader.pushPlugins.every((p) => isCompatiblePlugin(p, 'isGitProxyPushActionPlugin')),
       ).toBe(true);
-      expect(loader.pushPlugins[0]).toBeInstanceOf(PushActionPlugin);
     },
     { timeout: 10000 },
   );

test/testParseAction.test.ts

@@ -30,7 +30,7 @@ describe('Pre-processor: parseAction', () => {
     const req = {
       originalUrl: '/github.com/finos/git-proxy.git/git-upload-pack',
       method: 'GET',
-      headers: {},
+      headers: { 'content-type': 'application/x-git-upload-pack-request' },
     };
 
     const action = await preprocessor.exec(req);
@@ -44,7 +44,7 @@ describe('Pre-processor: parseAction', () => {
     const req = {
       originalUrl: '/finos/git-proxy.git/git-upload-pack',
       method: 'GET',
-      headers: {},
+      headers: { 'content-type': 'application/x-git-upload-pack-request' },
     };
 
     const action = await preprocessor.exec(req);