[JENKINS-75555] InvalidObjectIdException when "Scan Project Now" and multibranch-build-strategy plugin is installed (#1031)

Fix building of a GitSCM by BitbucketGitSCM in case of revision from a Pull Request web hook event that contains an abbreviate 7 chars of a SHA1 commit hash.

Author: nfalco79

checkstyle.xml

@@ -8,8 +8,7 @@
     </module>
 
     <module name="FileTabCharacter" />
-    <module name="NewlineAtEndOfFile">
-    </module>
+
     <module name="RegexpSingleline">
         <property name="format" value="\s+$" />
         <property name="message" value="Trailing spaces are not allowed." />

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketGitSCMBuilder.java

@@ -23,6 +23,8 @@
  */
 package com.cloudbees.jenkins.plugins.bitbucket;
 
+import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketApi;
+import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketCommit;
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketHref;
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepository;
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepositoryProtocol;
@@ -33,6 +35,7 @@
 import com.cloudbees.jenkins.plugins.bitbucket.impl.extension.FallbackToOtherRepositoryGitSCMExtension;
 import com.cloudbees.jenkins.plugins.bitbucket.impl.util.BitbucketApiUtils;
 import com.cloudbees.jenkins.plugins.bitbucket.impl.util.BitbucketCredentials;
+import com.cloudbees.jenkins.plugins.bitbucket.impl.util.SCMUtils;
 import com.cloudbees.jenkins.plugins.sshcredentials.SSHUserPrivateKey;
 import com.cloudbees.plugins.credentials.Credentials;
 import com.cloudbees.plugins.credentials.common.IdCredentials;
@@ -43,7 +46,11 @@
 import hudson.plugins.git.GitSCM;
 import hudson.plugins.git.browser.BitbucketServer;
 import hudson.plugins.git.browser.BitbucketWeb;
+import java.io.IOException;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import jenkins.plugins.git.AbstractGitSCMSource;
 import jenkins.plugins.git.GitSCMBuilder;
 import jenkins.plugins.git.MergeWithGitSCMExtension;
 import jenkins.scm.api.SCMHead;
@@ -59,6 +66,7 @@
  * @since 2.2.0
  */
 public class BitbucketGitSCMBuilder extends GitSCMBuilder<BitbucketGitSCMBuilder> {
+    private static final Logger logger = Logger.getLogger(BitbucketGitSCMBuilder.class.getName());
 
     /**
      * The {@link BitbucketSCMSource} who's {@link BitbucketSCMSource#getOwner()} can be used as the context for
@@ -233,18 +241,18 @@ private void withPullRequestRemote(PullRequestSCMHead head, String headName) { /
                 withRefSpec("+refs/heads/" + branchName + ":refs/remotes/@{remote}/" + branchName); // NOSONAR
             }
             if (cloneFromMirror) {
-                PullRequestSCMRevision pullRequestSCMRevision = (PullRequestSCMRevision) revision;
+                PullRequestSCMRevision prRevision = (PullRequestSCMRevision) revision;
                 String primaryRemoteName = remoteName().equals("primary") ? "primary-primary" : "primary";
                 String cloneLink = getCloneLink(primaryCloneLinks);
                 List<BranchWithHash> branchWithHashes;
                 if (checkoutStrategy == ChangeRequestCheckoutStrategy.MERGE) {
                     branchWithHashes = List.of(
-                        new BranchWithHash(branchName, pullRequestSCMRevision.getPull().getHash()),
-                        new BranchWithHash(targetBranch, pullRequestSCMRevision.getTargetImpl().getHash())
+                        new BranchWithHash(branchName, SCMUtils.getHash(prRevision.getPull())),
+                        new BranchWithHash(targetBranch, SCMUtils.getHash(prRevision))
                     );
                 } else {
                     branchWithHashes = List.of(
-                        new BranchWithHash(branchName, pullRequestSCMRevision.getPull().getHash())
+                        new BranchWithHash(branchName, SCMUtils.getHash(prRevision.getPull()))
                     );
                 }
                 withExtension(new FallbackToOtherRepositoryGitSCMExtension(cloneLink, primaryRemoteName, branchWithHashes));
@@ -264,7 +272,7 @@ private void withPullRequestRemote(PullRequestSCMHead head, String headName) { /
             }
         }
         if (head.getCheckoutStrategy() == ChangeRequestCheckoutStrategy.MERGE) {
-            String hash = revision instanceof PullRequestSCMRevision prRevision ? prRevision.getTargetImpl().getHash() : null;
+            String hash = revision instanceof PullRequestSCMRevision prRevision ? SCMUtils.getHash(prRevision) : null;
             String refSpec = "+refs/heads/" + targetBranch + ":refs/remotes/@{remote}/" + targetBranch;
             if (!prFromTargetRepository && scmCloud) {
                 String upstreamRemoteName = remoteName().equals("upstream") ? "upstream-upstream" : "upstream";
@@ -338,7 +346,8 @@ public GitSCM build() {
             if (head instanceof PullRequestSCMHead prHead) {
                 withHead(new SCMHead(prHead.getBranchName()));
                 if (rev instanceof PullRequestSCMRevision prRev) {
-                    withRevision(prRev.getPull());
+                    SCMRevision revision = resolvePullRequestRevision(prHead, prRev);
+                    withRevision(revision);
                 }
             }
             return super.build();
@@ -347,4 +356,22 @@ public GitSCM build() {
             withRevision(rev);
         }
     }
+
+    @NonNull
+    private SCMRevision resolvePullRequestRevision(PullRequestSCMHead prHead, PullRequestSCMRevision prRev) {
+        SCMRevision revision = prRev.getPull();
+        String hash = SCMUtils.getHash(revision);
+        if (hash != null && StringUtils.length(hash) != 40) { // JENKINS-75555
+            try (BitbucketApi client = scmSource.buildBitbucketClient(prHead)) {
+                BitbucketCommit commit = client.resolveCommit(hash);
+                if (commit != null) {
+                    revision = new AbstractGitSCMSource.SCMRevisionImpl(prHead, commit.getHash());
+                }
+            } catch (IOException | InterruptedException e) {
+                logger.log(Level.SEVERE, "Can not retrieve commit for hash " + hash, e);
+                throw new RuntimeException(e);
+            }
+        }
+        return revision;
+    }
 }

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/PullRequestSCMRevision.java

@@ -23,9 +23,7 @@
  */
 package com.cloudbees.jenkins.plugins.bitbucket;
 
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import jenkins.plugins.git.AbstractGitSCMSource;
 import jenkins.scm.api.SCMRevision;
 import jenkins.scm.api.mixin.ChangeRequestCheckoutStrategy;
 import jenkins.scm.api.mixin.ChangeRequestSCMRevision;
@@ -42,7 +40,7 @@ public class PullRequestSCMRevision extends ChangeRequestSCMRevision<PullRequest
      * The pull head revision.
      */
     @NonNull
-    private final AbstractGitSCMSource.SCMRevisionImpl pull;
+    private final SCMRevision pull;
 
     /**
      * Constructor.
@@ -51,7 +49,7 @@ public class PullRequestSCMRevision extends ChangeRequestSCMRevision<PullRequest
      * @param target the target revision.
      * @param pull   the pull revision.
      */
-    public PullRequestSCMRevision(@NonNull PullRequestSCMHead head, @NonNull AbstractGitSCMSource.SCMRevisionImpl target, @NonNull AbstractGitSCMSource.SCMRevisionImpl pull) {
+    public PullRequestSCMRevision(@NonNull PullRequestSCMHead head, @NonNull SCMRevision target, @NonNull SCMRevision pull) {
         super(head, target);
         this.pull = pull;
     }
@@ -61,8 +59,8 @@ public PullRequestSCMRevision(@NonNull PullRequestSCMHead head, @NonNull Abstrac
      *
      * @return the pull revision.
      */
-    @NonNull @WithBridgeMethods(SCMRevision.class)
-    public AbstractGitSCMSource.SCMRevisionImpl getPull() {
+    @NonNull
+    public SCMRevision getPull() {
         return pull;
     }
 
@@ -78,10 +76,6 @@ public boolean equivalent(ChangeRequestSCMRevision<?> o) {
         return getHead().equals(other.getHead()) && pull.equals(other.pull);
     }
 
-    public AbstractGitSCMSource.SCMRevisionImpl getTargetImpl() {
-        return (AbstractGitSCMSource.SCMRevisionImpl) getTarget();
-    }
-
     /**
      * {@inheritDoc}
      */

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/branch/BitbucketCloudAuthor.java

@@ -23,6 +23,10 @@
  */
 package com.cloudbees.jenkins.plugins.bitbucket.client.branch;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 /**
  * Represents the author information given by Bitbucket Cloud.
  *
@@ -32,6 +36,11 @@
 public class BitbucketCloudAuthor {
     private String raw;
 
+    @JsonCreator
+    public BitbucketCloudAuthor(@NonNull @JsonProperty("raw") String raw) {
+        this.raw = raw;
+    }
+
     /**
      * Returns the raw author string provided by the commit.
      *

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/pullrequest/BitbucketCloudPullRequestCommit.java

@@ -50,9 +50,10 @@ public String getAuthor() {
 
     public void setAuthor(String author) {
         if (this.author == null) {
-            this.author = new BitbucketCloudAuthor();
+            this.author = new BitbucketCloudAuthor(author);
+        } else {
+            this.author.setRaw(author);
         }
-        this.author.setRaw(author);
     }
 
     @Override

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/NativeServerPushHookProcessor.java

@@ -87,7 +87,8 @@ public void process(HookEventType hookEvent, String payload, BitbucketType insta
                     return;
                 }
             } else {
-                throw new UnsupportedOperationException("Unsupported hook event " + hookEvent);
+                throw new UnsupportedOperationException("Hook event of type " + hookEvent + " is not supported.\n"
+                        + "Please fill an issue at https://issues.jenkins.io to the bitbucket-branch-source-plugin component.");
             }
         } catch (final IOException e) {
             LOGGER.log(Level.SEVERE, "Can not read hook payload", e);

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/util/BitbucketApiUtils.java

@@ -66,7 +66,7 @@ public static boolean isCloud(BitbucketApi client) {
     }
 
     public static boolean isCloud(@NonNull String serverURL) {
-        return StringUtils.startsWithAny(serverURL, new String[] { BitbucketCloudEndpoint.SERVER_URL, BitbucketCloudEndpoint.BAD_SERVER_URL });
+        return StringUtils.startsWithAny(serverURL, BitbucketCloudEndpoint.SERVER_URL, BitbucketCloudEndpoint.BAD_SERVER_URL);
     }
 
     public static ListBoxModel getFromBitbucket(SCMSourceOwner context,

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/util/SCMUtils.java

@@ -0,0 +1,66 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2025, 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.impl.util;
+
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+import jenkins.plugins.git.AbstractGitSCMSource.SCMRevisionImpl;
+import jenkins.scm.api.SCMRevision;
+import jenkins.scm.api.mixin.ChangeRequestSCMRevision;
+
+/**
+ * Utility class that helps to extract specific information from implementation
+ * of SCM base classes.
+ *
+ * @author Nikolas Falco
+ * @since 936.1.0
+ */
+public final class SCMUtils {
+
+    private SCMUtils() {
+    }
+
+    /**
+     * Returns the SHA1 hash for the given SCMRevision implementation.
+     * <p>
+     * In case of ChangeRequestSCMRevision returns the SHA1 hash of the target.
+     *
+     * @param revision extract from
+     * @return a SHA1 commit hash in the revision if present
+     */
+    @CheckForNull
+    public static String getHash(@Nullable SCMRevision revision) {
+        if (revision == null) {
+            return null;
+        } else if (revision instanceof SCMRevisionImpl gitRev) {
+            return gitRev.getHash();
+        } else if (revision instanceof ChangeRequestSCMRevision<?> prRev) {
+            return getHash(prRev.getTarget());
+        } else {
+            throw new UnsupportedOperationException("Revision of type " + revision.getClass().getSimpleName() + " is not supported.\n"
+                    + "Please fill an issue at https://issues.jenkins.io to the bitbucket-branch-source-plugin component.");
+        }
+    }
+
+}

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketClientMockUtils.java

@@ -211,8 +211,7 @@ private static BitbucketCloudPullRequest getPullRequest() {
     }
 
     private static BitbucketCloudCommit buildCommit(String message, String date, String hash, String authorName) {
-        BitbucketCloudAuthor author = new BitbucketCloudAuthor();
-        author.setRaw(authorName);
+        BitbucketCloudAuthor author = new BitbucketCloudAuthor(authorName);
         return new BitbucketCloudCommit(message, date, hash, author, author, Collections.emptyList());
     }