Skip to content

Use CredentialsProvider.findCredentialByIdInItemGroup #787

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.

Sign up for GitHub

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

Merged
KostyaSha merged 2 commits into from
Jan 12, 2026
+17 −24
Merged

Use CredentialsProvider.findCredentialByIdInItemGroup #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8c25fd
Use `CredentialsProvider.findCredentialByIdInItemGroup`
jglick Jan 9, 2026
06b0574
Dep released
jglick Jan 12, 2026
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
10 changes: 8 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.504</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<release.skipTests>false</release.skipTests>
<ban-junit4-imports.skip>false</ban-junit4-imports.skip>
<tagNameFormat>v@{project.version}</tagNameFormat>
Expand Down Expand Up @@ -204,10 +204,16 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>4710.v016f0a_07e34d</version>
<version>5804.v80587a_38d937</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<!-- TODO until in BOM -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>1480.v2246fd131e83</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
31 changes: 9 additions & 22 deletions src/main/java/org/jenkinsci/plugins/github/config/GitHubServerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.cloudbees.plugins.credentials.CredentialsMatchers;
import com.cloudbees.plugins.credentials.common.StandardListBoxModel;
import com.cloudbees.plugins.credentials.domains.DomainRequirement;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
Expand All @@ -21,13 +20,10 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collections;
import java.util.List;
import jenkins.model.Jenkins;
import jenkins.scm.api.SCMName;
import org.apache.commons.lang3.StringUtils;
import org.jenkinsci.plugins.github.internal.GitHubLoginFunction;
import org.jenkinsci.plugins.github.util.FluentIterableWrapper;
import org.jenkinsci.plugins.github.util.misc.NullSafeFunction;
import org.jenkinsci.plugins.github.util.misc.NullSafePredicate;
import org.jenkinsci.plugins.plaincredentials.StringCredentials;
Expand All @@ -41,14 +37,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static com.cloudbees.plugins.credentials.CredentialsMatchers.filter;
import static com.cloudbees.plugins.credentials.CredentialsMatchers.withId;
import static com.cloudbees.plugins.credentials.CredentialsProvider.lookupCredentials;
import static com.cloudbees.plugins.credentials.CredentialsProvider.findCredentialByIdInItemGroup;
import static com.cloudbees.plugins.credentials.domains.URIRequirementBuilder.fromUri;
import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
import static org.apache.commons.lang3.StringUtils.defaultIfEmpty;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.commons.lang3.StringUtils.trimToEmpty;

/**
* This object represents configuration of each credentials-github pair.
Expand Down Expand Up @@ -287,20 +280,14 @@
*/
@NonNull
public static Optional<Secret> secretFor(String credentialsId) {
List<StringCredentials> creds = filter(
lookupCredentials(StringCredentials.class,
Jenkins.getInstance(), ACL.SYSTEM,
Collections.<DomainRequirement>emptyList()),
withId(trimToEmpty(credentialsId))
);

return FluentIterableWrapper.from(creds)
.transform(new NullSafeFunction<StringCredentials, Secret>() {
@Override
protected Secret applyNullSafe(@NonNull StringCredentials input) {
return input.getSecret();
}
}).first();
if (credentialsId == null) {

Check warning on line 283 in src/main/java/org/jenkinsci/plugins/github/config/GitHubServerConfig.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Partially covered line 

Line 283 is only partially covered, one branch is missing
return Optional.absent();

Check warning on line 284 in src/main/java/org/jenkinsci/plugins/github/config/GitHubServerConfig.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line 

Line 284 is not covered by tests
}
var creds = findCredentialByIdInItemGroup(credentialsId, StringCredentials.class, null, null, null);
if (creds == null) {
return Optional.absent();
}
return Optional.of(creds.getSecret());
}

/**
Expand Down
Loading