fix(datasource): re-encode URL to support white spaces in Azure proje…

…cts (#23354)
renovatebot · Jul 19, 2023 · ec44118 · ec44118
1 parent 43551e5
commit ec44118
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/lib/modules/manager/git-submodules/__fixtures__/.gitmodules.6 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
@@ -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
@@ -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 {