Convert apache gitbox URLs to normal ones

Author: holly-cummins

plugins/github-enricher/gatsby-node.js

@@ -141,7 +141,14 @@ exports.onCreateNode = async (
 
   // A bit ugly, we need a unique identifier in string form, and we also need the url; use a comma-separated string
   const id = metadata?.sourceControl
-  const scmUrl = id?.split(",")[0]
+  let scmUrl = id?.split(",")[0]
+
+  if (scmUrl?.includes("gitbox.apache.org")) {
+    const urlState = new URL(scmUrl).search
+    const matches = urlState?.match(/p=(.*).git;/)
+    const projectName = matches?.length > 0 && matches[1]
+    scmUrl = `https://github.com/apache/${projectName}`
+  }
 
   if (scmUrl) {
 

plugins/github-enricher/gatsby-node.test.js

@@ -485,7 +485,6 @@ describe("the github data handler", () => {
     describe("where the scm-url ends with .git", () => {
 
       const url = "http://phony.github.com/thing.git"
-      const otherUrl = "http://fake.github.com/someuser/other" + projectName
 
       const response = {
         data: {
@@ -494,18 +493,6 @@ describe("the github data handler", () => {
               totalCount: 16,
             },
             defaultBranchRef: { name: "unusual" },
-            metaInfs: null,
-            subfolderMetaInfs: null,
-            shortenedSubfolderMetaInfs: {
-              entries: [
-                { path: "runtime/src/main/resources/META-INF/beans.xml" },
-                {
-                  path: "some-folder-name/runtime/src/main/resources/META-INF/quarkus-extension.yaml",
-                },
-                { path: "runtime/src/main/resources/META-INF/services" },
-              ],
-            },
-            openGraphImageUrl: socialMediaPreviewUrl,
           },
           repositoryOwner: { avatarUrl: avatarUrl },
         },
@@ -521,13 +508,65 @@ describe("the github data handler", () => {
         internal,
       }
 
-      const otherMetadata = {
+      beforeAll(async () => {
+        queryGraphQl.mockResolvedValue(response)
+        getContributors.mockResolvedValue({ contributors: [{ name: "someone" }], lastUpdated: Date.now() })
+        await onPreBootstrap({ cache, actions: {} })
+      })
+
+      beforeEach(async () => {
+        // Clear the cache
+        onPluginInit()
+
+        // Needed so that we do not short circuit the git path
+        return onCreateNode({
+          node,
+          createContentDigest,
+          createNodeId,
+          actions,
+        })
+      })
+
+      afterAll(() => {
+        jest.clearAllMocks()
+      })
+
+      afterEach(() => {
+        jest.clearAllMocks()
+      })
+
+      it("fills in an issues url", async () => {
+        expect(createNode).toHaveBeenCalledWith(
+          expect.objectContaining({ issuesUrl: "http://phony.github.com/thing/issues" })
+        )
+      })
+
+    })
+
+    describe("where the scm-url is a gitbox url", () => {
+
+      const url = "https://gitbox.apache.org/repos/asf?p=camel-quarkus.git;a=summary"
+      const expectedUrl = "https://github.com/apache/camel-quarkus"
+
+      const response = {
+        data: {
+          repository: {
+            issues: {
+              totalCount: 16,
+            },
+            defaultBranchRef: { name: "unusual" },
+          },
+          repositoryOwner: { avatarUrl: avatarUrl },
+        },
+      }
+
+      const metadata = {
         maven: { artifactId: "something", groupId: "grouper" },
-        sourceControl: `${otherUrl},mavenstuff`,
+        sourceControl: `${url},mavenstuff`,
       }
 
-      const otherNode = {
-        metadata: otherMetadata,
+      const node = {
+        metadata,
         internal,
       }
 
@@ -558,9 +597,15 @@ describe("the github data handler", () => {
         jest.clearAllMocks()
       })
 
+      it("adjusts the scm url", async () => {
+        expect(createNode).toHaveBeenCalledWith(
+          expect.objectContaining({ repository: expectedUrl })
+        )
+      })
+
       it("fills in an issues url", async () => {
         expect(createNode).toHaveBeenCalledWith(
-          expect.objectContaining({ issuesUrl: "http://phony.github.com/thing/issues" })
+          expect.objectContaining({ issuesUrl: `${expectedUrl}/issues` })
         )
       })