Merge pull request #280 from Vlatombe/jep-227

jep-227 downstream usage
jenkinsci · Nov 1, 2023 · f929416 · f929416
2 parents 5eb8611 + 058e749
commit f929416
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -56,6 +56,11 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>credentials</artifactId>
+        <version>1307.v3757c78f17c3</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>

diff --git a/src/main/java/org/jenkinsci/plugins/credentialsbinding/BindingDescriptor.java b/src/main/java/org/jenkinsci/plugins/credentialsbinding/BindingDescriptor.java
@@ -60,7 +60,7 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item owner) {
         // when configuring the job, you only want those credentials that are available to ACL.SYSTEM selectable
         // as we cannot select from a user's credentials unless they are the only user submitting the build
         // (which we cannot assume) thus ACL.SYSTEM is correct here.
-        return new Model().withAll(CredentialsProvider.lookupCredentials(type(), owner, ACL.SYSTEM, Collections.emptyList()));
+        return new Model().withAll(CredentialsProvider.lookupCredentialsInItem(type(), owner, ACL.SYSTEM2, Collections.emptyList()));
     }
 
     private final class Model extends AbstractIdCredentialsListBoxModel<Model,C> {

diff --git a/src/main/java/org/jenkinsci/plugins/credentialsbinding/impl/ZipFileBinding.java b/src/main/java/org/jenkinsci/plugins/credentialsbinding/impl/ZipFileBinding.java
@@ -92,7 +92,7 @@ public FormValidation doCheckCredentialsId(StaplerRequest req, @AncestorInPath I
                     return FormValidation.ok();
                 }
             }
-            for (FileCredentials c : CredentialsProvider.lookupCredentials(FileCredentials.class, owner, null, Collections.emptyList())) {
+            for (FileCredentials c : CredentialsProvider.lookupCredentialsInItem(FileCredentials.class, owner, null, Collections.emptyList())) {
                 if (c.getId().equals(value)) {
                     InputStream is = null;
                     try {

diff --git a/...test/java/org/jenkinsci/plugins/credentialsbinding/impl/SSHUserPrivateKeyBindingTest.java b/...test/java/org/jenkinsci/plugins/credentialsbinding/impl/SSHUserPrivateKeyBindingTest.java
@@ -193,7 +193,7 @@ public CredentialsScope getScope() {
                 assertTrue(key.exists());
                 assertEquals(keyContent, key.readToString().trim());
 
-                ((DummyPrivateKey) CredentialsProvider.lookupCredentials(SSHUserPrivateKey.class, story.j.jenkins, ACL.SYSTEM, Collections.emptyList()).get(0)).usernameSecret = false;
+                ((DummyPrivateKey) CredentialsProvider.lookupCredentialsInItemGroup(SSHUserPrivateKey.class, story.j.jenkins, ACL.SYSTEM2, Collections.emptyList()).get(0)).usernameSecret = false;
                 SemaphoreStep.success("basics/2", null);
                 b = story.j.buildAndAssertSuccess(p);
                 story.j.assertLogContains(username, b);