diff --git a/lib/modules/manager/git-submodules/__fixtures__/.gitmodules.6 b/lib/modules/manager/git-submodules/__fixtures__/.gitmodules.6 new file mode 100644 index 0000000000000000000000000000000000000000..05945a1bbc4ca5fdad8ec805144c6abc14eb5e26 --- /dev/null +++ b/lib/modules/manager/git-submodules/__fixtures__/.gitmodules.6 @@ -0,0 +1,3 @@ +[submodule "some-azure"] + path = some-azure + url = https://organization@dev.azure.com/organization/whitespace%20project/_git/repo diff --git a/lib/modules/manager/git-submodules/extract.spec.ts b/lib/modules/manager/git-submodules/extract.spec.ts index c6e53cc5ea7f5c024542eb89622f414a8bcf67c0..a297bcceff292a7a898bc96d165e12e6070c7609 100644 --- a/lib/modules/manager/git-submodules/extract.spec.ts +++ b/lib/modules/manager/git-submodules/extract.spec.ts @@ -164,5 +164,29 @@ describe('modules/manager/git-submodules/extract', () => { ], }); }); + + it('whitespaces in submodule URL are encoded properly', async () => { + hostRules.add({ + matchHost: 'organization@dev.azure.com/organization', + token: 'pat', + hostType: 'azure', + }); + gitMock.listRemote.mockResolvedValueOnce( + 'ref: refs/heads/main HEAD\n5701164b9f5edba1f6ca114c491a564ffb55a964 HEAD' + ); + const res = await extractPackageFile('', '.gitmodules.6', {}); + expect(res).toEqual({ + datasource: 'git-refs', + deps: [ + { + currentDigest: '4b825dc642cb6eb9a060e54bf8d69288fbee4904', + currentValue: 'main', + depName: 'some-azure', + packageName: + 'https://organization@dev.azure.com/organization/whitespace%20project/_git/repo', + }, + ], + }); + }); }); }); diff --git a/lib/util/git/url.ts b/lib/util/git/url.ts index fe3174d201df6e46455e3fb4c3c065c473f4ebab..4dd08563f140317b65d3ba526ddfe5d7774d9b18 100644 --- a/lib/util/git/url.ts +++ b/lib/util/git/url.ts @@ -32,7 +32,7 @@ export function getHttpUrl(url: string, token?: string): string { } } - return parsedUrl.toString(protocol); + return new URL(parsedUrl.toString(protocol)).href; } export function getRemoteUrlWithToken(url: string, hostType?: string): string {