feat: fix paths

SAP · Jan 28, 2025 · edcec7f · edcec7f
1 parent 7a4df70
commit edcec7f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/config.ts b/src/config.ts
@@ -54,21 +54,20 @@ function processCustomDefaultsPath(path: string, currentBranch?: string): string
   const defaultBranch = currentBranch ?? process.env.GITHUB_REF_NAME ?? 'main'
 
   if (!apiUrl || !repo) {
-    // For local development or when GitHub context is not available
     return path
   }
 
   // Handle relative paths with branch references (org/repo/path@branch)
   const branchMatch = path.match(/^([^@]+)@(.+)$/)
   if (branchMatch) {
     const [, filePath, branch] = branchMatch
-    // Use GitHub API v3 format
-    return `${apiUrl}/repos/${repo}/contents/${filePath}?ref=${branch}`
+    // Don't include repo in filePath if it's already a full path
+    const cleanPath = filePath.startsWith(repo) ? filePath : `${repo}/${filePath}`
+    return `${apiUrl}/repos/${cleanPath}?ref=${branch}`
   }
 
   // For simple file paths, don't add server URL or branch
   if (path.startsWith('./') || path.startsWith('../')) {
-    // Convert relative paths to absolute repo paths
     const normalizedPath = path.replace(/^[.\/]+/, '')
     return `${apiUrl}/repos/${repo}/contents/${normalizedPath}?ref=${defaultBranch}`
   }
@@ -79,7 +78,8 @@ function processCustomDefaultsPath(path: string, currentBranch?: string): string
   }
 
   // Handle organization/repository paths
-  return `${apiUrl}/repos/${repo}/contents/${path}?ref=${defaultBranch}`
+  const cleanPath = path.startsWith(repo) ? path : `${repo}/${path}`
+  return `${apiUrl}/repos/${cleanPath}?ref=${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
@@ -256,10 +256,10 @@ describe('Config', () => {
     process.env.GITHUB_REF_NAME = 'main'
 
     const customPaths = [
-      'org/repo/config.yaml@feature',
-      'local/config.yaml',
+      '.pipeline/custom-defaults.yml',
+      '../shared/config.yaml',
       'https://github.tools.sap/api/v3/repos/org/repo/config.yaml?ref=develop',
-      'shared/config.yaml'
+      'custom/path/config.yaml@feature'
     ].join(',')
 
     piperExecResultMock = generatePiperGetDefaultsOutput([
@@ -281,20 +281,20 @@ describe('Config', () => {
       '--defaultsFile',
       'http://mock.test/asset/piper-defaults.yml',
       '--defaultsFile',
-      'https://github.tools.sap/api/v3/repos/piper-test/gha-demo-k8s-node/contents/org/repo/config.yaml?ref=feature',
+      'https://github.tools.sap/api/v3/repos/piper-test/gha-demo-k8s-node/contents/pipeline/custom-defaults.yml?ref=main',
       '--defaultsFile',
-      'https://github.tools.sap/api/v3/repos/piper-test/gha-demo-k8s-node/contents/local/config.yaml?ref=main',
+      'https://github.tools.sap/api/v3/repos/piper-test/gha-demo-k8s-node/contents/shared/config.yaml?ref=main',
       '--defaultsFile',
       'https://github.tools.sap/api/v3/repos/org/repo/config.yaml?ref=develop',
       '--defaultsFile',
-      'https://github.tools.sap/api/v3/repos/piper-test/gha-demo-k8s-node/contents/shared/config.yaml?ref=main'
+      'https://github.tools.sap/api/v3/repos/piper-test/gha-demo-k8s-node/contents/custom/path/config.yaml?ref=feature'
     ]))
   })
 
   test('Sanitizes filenames when saving', async () => {
     const paths = [
-      'https://github.tools.sap/api/v3/repos/org/repo/contents/config.yaml?ref=feature',
-      'local/config.yaml'
+      'https://github.tools.sap/api/v3/repos/piper-test/gha-demo-k8s-node/contents/config.yaml?ref=feature',
+      '.pipeline/custom.yml'
     ]
 
     piperExecResultMock = generatePiperGetDefaultsOutput(paths)