seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Support BitBucket endpoint with path (#665) 

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
pull/669/head
Anatolii Bazko 2024-03-12 10:22:04 +01:00 committed by GitHub
parent 6cdf6f655a
commit 28002fb835
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerURLParser.java
View File

@ -78,7 +78,7 @@ public class BitbucketServerURLParser {
bitbucketUrlPatternTemplates.forEach( bitbucketUrlPatternTemplates.forEach(
t -> { t -> {
String scheme = t.contains("git@") ? "ssh" : uri.getScheme(); 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))); bitbucketUrlPatterns.add(Pattern.compile(format(t, scheme, host)));
}); });
} }

5
wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerURLParserTest.java
View File

@ -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 * This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0 * available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/ * which is available at https://www.eclipse.org/legal/epl-2.0/
@ -59,7 +59,7 @@ public class BitbucketServerURLParserTest {
public void setUp() { public void setUp() {
bitbucketURLParser = bitbucketURLParser =
new BitbucketServerURLParser( new BitbucketServerURLParser(
"https://bitbucket.2mcl.com,https://bbkt.com", "https://bitbucket.2mcl.com,https://bbkt.com,https://my-bitbucket.org/bitbucket",
devfileFilenamesProvider, devfileFilenamesProvider,
oAuthAPI, oAuthAPI,
mock(PersonalAccessTokenManager.class)); mock(PersonalAccessTokenManager.class));
@ -145,6 +145,7 @@ public class BitbucketServerURLParserTest {
@DataProvider(name = "UrlsProvider") @DataProvider(name = "UrlsProvider")
public Object[][] urls() { public Object[][] urls() {
return new Object[][] { 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/~user/repo.git"},
{"https://bitbucket.2mcl.com/scm/project/test1.git"}, {"https://bitbucket.2mcl.com/scm/project/test1.git"},
{"https://bitbucket.2mcl.com/projects/project/repos/test1/browse?at=refs%2Fheads%2Fbranch"}, {"https://bitbucket.2mcl.com/projects/project/repos/test1/browse?at=refs%2Fheads%2Fbranch"},