Skip to content

Improve performance of credentials lookup #3912

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
MarkEWaite merged 4 commits into from
Jan 25, 2026
+35 −38
Merged

Improve performance of credentials lookup #3912

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df5815c
Use `CredentialsProvider.findCredentialByIdInItem`
jglick Jan 7, 2026
bcccc84
Dep released
jglick Jan 12, 2026
d056919
Merge branch 'master' into byId
MarkEWaite Jan 25, 2026
57f4073
Rely on plugin BOM for credentials version
MarkEWaite Jan 25, 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
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- TODO until in BOM -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>1480.v2246fd131e83</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/hudson/plugins/git/UserRemoteConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package hudson.plugins.git;

import com.cloudbees.plugins.credentials.CredentialsMatchers;
import com.cloudbees.plugins.credentials.CredentialsProvider;
import com.cloudbees.plugins.credentials.common.StandardCredentials;
import com.cloudbees.plugins.credentials.common.StandardListBoxModel;
Expand Down Expand Up @@ -268,10 +267,12 @@ public FormValidation doCheckRefspec(@QueryParameter String name,
}

private static StandardCredentials lookupCredentials(@CheckForNull Item project, String credentialId, String uri) {
return (credentialId == null) ? null : CredentialsMatchers.firstOrNull(
CredentialsProvider.lookupCredentialsInItem(StandardCredentials.class, project, ACL.SYSTEM2,
GitURIRequirementsBuilder.fromUri(uri).build()),
CredentialsMatchers.withId(credentialId));
return (credentialId == null) ? null : CredentialsProvider.findCredentialByIdInItem(
credentialId,
StandardCredentials.class,
project,
ACL.SYSTEM2,
GitURIRequirementsBuilder.fromUri(uri).build());
}

@Override
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
*/
package jenkins.plugins.git;

import com.cloudbees.plugins.credentials.CredentialsMatchers;
import com.cloudbees.plugins.credentials.CredentialsNameProvider;
import com.cloudbees.plugins.credentials.CredentialsProvider;
import com.cloudbees.plugins.credentials.common.StandardCredentials;
Expand Down Expand Up @@ -1330,12 +1329,13 @@
if (credentialsId == null) {
return null;
}
return CredentialsMatchers
.firstOrNull(
CredentialsProvider.lookupCredentialsInItem(StandardUsernameCredentials.class, context,
ACL.SYSTEM2, URIRequirementBuilder.fromUri(getRemote()).build()),
CredentialsMatchers.allOf(CredentialsMatchers.withId(credentialsId),
GitClient.CREDENTIALS_MATCHER));
var credential = CredentialsProvider.findCredentialByIdInItem(
credentialsId,
StandardUsernameCredentials.class,
context,
ACL.SYSTEM2,
URIRequirementBuilder.fromUri(getRemote()).build());
return credential != null && GitClient.CREDENTIALS_MATCHER.matches(credential) ? credential : null;

Check warning on line 1338 in src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Partially covered line 

Line 1338 is only partially covered, 3 branches are missing
}

/**
Expand Down
26 changes: 11 additions & 15 deletions src/main/java/jenkins/plugins/git/GitSCMFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

package jenkins.plugins.git;

import com.cloudbees.plugins.credentials.CredentialsMatchers;
import com.cloudbees.plugins.credentials.CredentialsProvider;
import com.cloudbees.plugins.credentials.common.StandardCredentials;
import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials;
Expand Down Expand Up @@ -369,20 +368,17 @@
GitClient client = git.getClient();
String credentialsId = config.getCredentialsId();
if (credentialsId != null) {
StandardCredentials credential = CredentialsMatchers.firstOrNull(
CredentialsProvider.lookupCredentialsInItem(
StandardUsernameCredentials.class,
owner,
ACL.SYSTEM2,
URIRequirementBuilder.fromUri(remote).build()
),
CredentialsMatchers.allOf(
CredentialsMatchers.withId(credentialsId),
GitClient.CREDENTIALS_MATCHER
)
);
client.addDefaultCredentials(credential);
CredentialsProvider.track(owner, credential);
var credential = CredentialsProvider.findCredentialByIdInItem(
credentialsId,
StandardUsernameCredentials.class,
owner,
ACL.SYSTEM2,
URIRequirementBuilder.fromUri(remote).build());
StandardCredentials matchedCredential = credential != null && GitClient.CREDENTIALS_MATCHER.matches(credential)
? credential
: null;
client.addDefaultCredentials(matchedCredential);
CredentialsProvider.track(owner, matchedCredential);

Check warning on line 381 in src/main/java/jenkins/plugins/git/GitSCMFileSystem.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered lines 

Lines 371-381 are not covered by tests
}

if (!client.hasGitRepo(false)) {
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/jenkins/plugins/git/GitSCMTelescope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

package jenkins.plugins.git;

import com.cloudbees.plugins.credentials.CredentialsMatchers;
import com.cloudbees.plugins.credentials.CredentialsProvider;
import com.cloudbees.plugins.credentials.common.StandardCredentials;
import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials;
Expand Down Expand Up @@ -189,16 +188,17 @@
StandardCredentials credentials;
String credentialsId = config.getCredentialsId();
if (credentialsId != null) {
List<StandardUsernameCredentials> urlCredentials = CredentialsProvider
.lookupCredentialsInItem(StandardUsernameCredentials.class, owner,
owner instanceof Queue.Task t
? Tasks.getAuthenticationOf2(t)
: ACL.SYSTEM2, URIRequirementBuilder.fromUri(remote).build());
credentials = CredentialsMatchers.firstOrNull(
urlCredentials,
CredentialsMatchers
.allOf(CredentialsMatchers.withId(credentialsId), GitClient.CREDENTIALS_MATCHER)
);
var credential = CredentialsProvider.findCredentialByIdInItem(
credentialsId,
StandardUsernameCredentials.class,
owner,
owner instanceof Queue.Task t
? Tasks.getAuthenticationOf2(t)
: ACL.SYSTEM2,
URIRequirementBuilder.fromUri(remote).build());
credentials = credential != null && GitClient.CREDENTIALS_MATCHER.matches(credential)
? credential
: null;

Check warning on line 201 in src/main/java/jenkins/plugins/git/GitSCMTelescope.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered lines 

Lines 191-201 are not covered by tests
} else {
credentials = null;
}
Expand Down
Loading