Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.util.Optional;

import org.apache.commons.lang3.StringUtils;

import edu.hm.hafner.util.FilteredLog;
import edu.umd.cs.findbugs.annotations.CheckForNull;

Expand Down
23 changes: 20 additions & 3 deletions src/main/java/io/jenkins/plugins/checks/github/SCMFacade.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import com.cloudbees.plugins.credentials.CredentialsMatchers;
import com.cloudbees.plugins.credentials.CredentialsProvider;
import com.cloudbees.plugins.credentials.domains.DomainRequirement;
import com.cloudbees.plugins.credentials.domains.URIRequirementBuilder;
import edu.umd.cs.findbugs.annotations.CheckForNull;
import hudson.model.AbstractProject;
import hudson.model.Job;
Expand All @@ -10,7 +12,6 @@
import hudson.plugins.git.UserRemoteConfig;
import hudson.scm.NullSCM;
import hudson.scm.SCM;
import hudson.security.ACL;
import jenkins.plugins.git.AbstractGitSCMSource;
import jenkins.plugins.git.GitSCMSource;
import jenkins.scm.api.SCMHead;
Expand Down Expand Up @@ -123,13 +124,29 @@ UserRemoteConfig getUserRemoteConfig(final GitSCM scm) {
* @return the found GitHub App credentials or empty
*/
public Optional<GitHubAppCredentials> findGitHubAppCredentials(final Job<?, ?> job, final String credentialsId) {
List<GitHubAppCredentials> credentials = CredentialsProvider.lookupCredentials(
GitHubAppCredentials.class, job, ACL.SYSTEM, Collections.emptyList());
List<DomainRequirement> repoUrl = getDomainRequirements(job);
List<GitHubAppCredentials> credentials = Collections.singletonList(CredentialsProvider.findCredentialById(
credentialsId,
GitHubAppCredentials.class,
job.getLastBuild(),
repoUrl));
GitHubAppCredentials appCredentials =
CredentialsMatchers.firstOrNull(credentials, CredentialsMatchers.withId(credentialsId));
return Optional.ofNullable(appCredentials);
}

private List<DomainRequirement> getDomainRequirements(Job<?, ?> job) {
Optional<GitSCM> scmFromJob = findGitSCM(job);
Optional<GitSCM> scmFromBuild = findGitSCM(job.getLastBuild());
List<DomainRequirement> repoUrl = null;
if (scmFromJob.isPresent()) {
repoUrl = URIRequirementBuilder.fromUri(getUserRemoteConfig(scmFromJob.get()).getUrl()).build();
} else if (scmFromBuild.isPresent()) {
repoUrl = URIRequirementBuilder.fromUri(getUserRemoteConfig(scmFromBuild.get()).getUrl()).build();
}
return repoUrl;
}

/**
* Find {@link SCMHead} (or branch) used by the {@code job}.
*
Expand Down