Skip to content

Commit

Permalink
fix: Support BitBucket endpoint with path (#665)
Browse files Browse the repository at this point in the history
Signed-off-by: Anatolii Bazko <[email protected]>
  • Loading branch information
tolusha authored Mar 12, 2024
1 parent 6cdf6f6 commit 28002fb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public BitbucketServerURLParser(
bitbucketUrlPatternTemplates.forEach(
t -> {
String scheme = t.contains("git@") ? "ssh" : uri.getScheme();
String host = uri.getHost();
String host = uri.getHost() + uri.getPath();
bitbucketUrlPatterns.add(Pattern.compile(format(t, scheme, host)));
});
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2023 Red Hat, Inc.
* Copyright (c) 2012-2024 Red Hat, Inc.
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
Expand Down Expand Up @@ -59,7 +59,7 @@ public void prepare() {
public void setUp() {
bitbucketURLParser =
new BitbucketServerURLParser(
"https://bitbucket.2mcl.com,https://bbkt.com",
"https://bitbucket.2mcl.com,https://bbkt.com,https://my-bitbucket.org/bitbucket",
devfileFilenamesProvider,
oAuthAPI,
mock(PersonalAccessTokenManager.class));
Expand Down Expand Up @@ -145,6 +145,7 @@ public void shouldNotValidateUrlByApiRequest() {
@DataProvider(name = "UrlsProvider")
public Object[][] urls() {
return new Object[][] {
{"https://my-bitbucket.org/bitbucket/scm/proj/repo.git"},
{"https://bitbucket.2mcl.com/scm/~user/repo.git"},
{"https://bitbucket.2mcl.com/scm/project/test1.git"},
{"https://bitbucket.2mcl.com/projects/project/repos/test1/browse?at=refs%2Fheads%2Fbranch"},
Expand Down

0 comments on commit 28002fb

Please sign in to comment.