-
Notifications
You must be signed in to change notification settings - Fork 355
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[JENKINS-75410] extends AbstractGitSCMSource for BitbucketSCMSource #1006
Open
gboucherie
wants to merge
1
commit into
jenkinsci:935.1.x
Choose a base branch
from
gboucherie:feature/JENKINS-75410
base: 935.1.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
78 changes: 78 additions & 0 deletions
78
src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketGitSCMHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
/* | ||
* The MIT License | ||
* | ||
* Copyright (c) 2016-2017, CloudBees, Inc., Nikolas Falco | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
* THE SOFTWARE. | ||
*/ | ||
package com.cloudbees.jenkins.plugins.bitbucket; | ||
|
||
import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketHref; | ||
import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepositoryProtocol; | ||
import com.cloudbees.jenkins.plugins.bitbucket.impl.util.BitbucketCredentials; | ||
import com.cloudbees.jenkins.plugins.sshcredentials.SSHUserPrivateKey; | ||
import com.cloudbees.plugins.credentials.common.StandardCredentials; | ||
import edu.umd.cs.findbugs.annotations.CheckForNull; | ||
import edu.umd.cs.findbugs.annotations.NonNull; | ||
import hudson.Util; | ||
import java.util.List; | ||
import org.apache.commons.lang.StringUtils; | ||
|
||
public class BitbucketGitSCMHelper { | ||
protected static String getCloneLink(@NonNull BitbucketSCMSource scmSource, | ||
@CheckForNull List<BitbucketHref> primaryCloneLinks, | ||
@CheckForNull List<BitbucketHref> mirrorCloneLinks) { | ||
if (primaryCloneLinks == null) { | ||
throw new IllegalArgumentException("Primary clone links shouldn't be null"); | ||
} | ||
mirrorCloneLinks = Util.fixNull(mirrorCloneLinks); | ||
if (mirrorCloneLinks.isEmpty()) { | ||
return getCloneLink(scmSource, mirrorCloneLinks); | ||
} | ||
return getCloneLink(scmSource, primaryCloneLinks); | ||
} | ||
|
||
private static String getCloneLink(BitbucketSCMSource scmSource, List<BitbucketHref> cloneLinks) { | ||
BitbucketRepositoryProtocol protocol = getProtocol(scmSource); | ||
return cloneLinks.stream() | ||
.filter(link -> protocol.matches(link.getName())) | ||
.findAny() | ||
.orElseThrow( | ||
() -> new IllegalStateException("Can't find clone link for protocol " + protocol)) | ||
.getHref(); | ||
} | ||
|
||
private static BitbucketRepositoryProtocol getProtocol(BitbucketSCMSource scmSource) { | ||
String credentialsId = scmSource.getCredentialsId(); | ||
if (StringUtils.isNotBlank(credentialsId)) { | ||
StandardCredentials credentials = BitbucketCredentials.lookupCredentials( | ||
scmSource.getServerUrl(), | ||
scmSource.getOwner(), | ||
BitbucketSCMSource.DescriptorImpl.SAME.equals( | ||
scmSource.getCheckoutCredentialsId()) ? credentialsId : | ||
scmSource.getCheckoutCredentialsId(), | ||
Check noticeCode scanning / CodeQL Deprecated method or constructor invocation Note
Invoking
BitbucketSCMSource.getCheckoutCredentialsId Error loading related location Loading |
||
StandardCredentials.class | ||
); | ||
if (credentials instanceof SSHUserPrivateKey) { | ||
return BitbucketRepositoryProtocol.SSH; | ||
} | ||
} | ||
return BitbucketRepositoryProtocol.HTTP; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check notice
Code scanning / CodeQL
Deprecated method or constructor invocation Note