From a316cd838da728b051deafc018dd2f444159114c Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 8 Sep 2021 10:59:40 +0200 Subject: [PATCH] chore: reverting stripping as we don't need it Signed-off-by: blam --- packages/backend-common/src/reading/AzureUrlReader.ts | 6 +++--- packages/backend-common/src/reading/tree/util.ts | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/backend-common/src/reading/AzureUrlReader.ts b/packages/backend-common/src/reading/AzureUrlReader.ts index 5369306702..2269393cbf 100644 --- a/packages/backend-common/src/reading/AzureUrlReader.ts +++ b/packages/backend-common/src/reading/AzureUrlReader.ts @@ -94,8 +94,6 @@ export class AzureUrlReader implements UrlReader { url: string, options?: ReadTreeOptions, ): Promise { - // TODO: Support filepath based reading tree feature like other providers - // Get latest commit SHA const commitsAzureResponse = await fetch( @@ -129,11 +127,13 @@ export class AzureUrlReader implements UrlReader { throw new Error(message); } + const { filepath } = parseGitUrl(url); + return await this.deps.treeResponseFactory.fromZipArchive({ stream: archiveAzureResponse.body as unknown as Readable, etag: commitSha, filter: options?.filter, - stripFirstDirectory: true, + subpath: filepath, }); } diff --git a/packages/backend-common/src/reading/tree/util.ts b/packages/backend-common/src/reading/tree/util.ts index cfb986a0b0..5ddc5a3766 100644 --- a/packages/backend-common/src/reading/tree/util.ts +++ b/packages/backend-common/src/reading/tree/util.ts @@ -21,5 +21,6 @@ const directoryNameRegex = /^[^\/]+\//; // Removes the first segment of a forward-slash-separated path export function stripFirstDirectoryFromPath(path: string): string { + console.log('stripFirstDirectoryPath path:', path); return path.replace(directoryNameRegex, ''); }