feat: test raw gh links

SAP · Jan 28, 2025 · 067b78c · 067b78c
1 parent f0b2d93
commit 067b78c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -50,11 +50,16 @@ function processCustomDefaultsPath(path: string, currentBranch?: string): string
     return url.toString()
   }
 
+  const baseUrl = process.env.GITHUB_SERVER_URL
+  const repo = process.env.GITHUB_REPOSITORY
+  const defaultBranch = currentBranch ?? process.env.GITHUB_REF_NAME ?? 'main'
+
+
   // Handle relative paths with branch references (org/repo/path@branch)
   const branchMatch = path.match(/^([^@]+)@(.+)$/)
   if (branchMatch) {
     const [, filePath, branch] = branchMatch
-    return `${process.env.GITHUB_SERVER_URL}/${filePath}?ref=${branch}`
+    return `${baseUrl}/raw/${filePath}/${branch}`
   }
 
   // For simple file paths, don't add server URL or branch
@@ -63,8 +68,7 @@ function processCustomDefaultsPath(path: string, currentBranch?: string): string
   }
 
   // Handle organization/repository paths (without branch reference)
-  const branch = currentBranch ?? process.env.GITHUB_REF_NAME ?? 'main'
-  return `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/${path}?ref=${branch}`
+  return `${baseUrl}/raw/${repo}/${path}/${defaultBranch}`
 }
 
 export async function downloadDefaultConfig (server: string, apiURL: string, version: string, token: string, owner: string, repository: string, customDefaultsPaths: string): Promise<UploadResponse> {

diff --git a/test/config.test.ts b/test/config.test.ts
@@ -280,13 +280,13 @@ describe('Config', () => {
       '--defaultsFile',
       'http://mock.test/asset/piper-defaults.yml',
       '--defaultsFile',
-      'https://github.com/org/repo/config.yaml?ref=feature',
+      'https://github.com/raw/org/repo/config.yaml/feature',
+      '--defaultsFile',
+      'https://github.com/raw/org/repo/local/config.yaml/main',
       '--defaultsFile',
-      'https://github.com/org/repo/local/config.yaml?ref=main',
-      '--defaultsFile', 
       'https://github.com/org/repo/config.yaml?ref=develop',
       '--defaultsFile',
-      'https://github.com/org/repo/shared/config.yaml?ref=main'
+      'https://github.com/raw/org/repo/shared/config.yaml/main'
     ]))
   })
 
@@ -295,7 +295,7 @@ describe('Config', () => {
       'https://github.com/org/repo/config.yaml?ref=feature',
       'local/config.yaml'
     ]
-    
+
     piperExecResultMock = generatePiperGetDefaultsOutput(paths)
 
     const result = await config.downloadDefaultConfig(