fix: unable to get global credentials from standard build jobs

Author: Marco Marche

src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusHelper.java

@@ -180,12 +180,12 @@ private static String guessBitbucketBuildState(final Result result) {
         return state;
     }
 
-    public static void notifyBuildStatus(final String credentialsId, final Run<?, ?> build,
+    public static void notifyBuildStatus(UsernamePasswordCredentials credentials, final Run<?, ?> build,
                                          final TaskListener listener) throws Exception {
-        notifyBuildStatus(credentialsId, build, listener, createBitbucketBuildStatusFromBuild(build));
+        notifyBuildStatus(credentials, build, listener, createBitbucketBuildStatusFromBuild(build));
     }
 
-    public static void notifyBuildStatus(final String credentialsId, final Run<?, ?> build,
+    public static void notifyBuildStatus(UsernamePasswordCredentials credentials, final Run<?, ?> build,
                                          final TaskListener listener, BitbucketBuildStatus buildStatus) throws Exception {
 
         List<BitbucketBuildStatusResource> buildStatusResources = createBuildStatusResources(build);
@@ -208,17 +208,15 @@ public static void notifyBuildStatus(final String credentialsId, final Run<?, ?>
                 }
             }
 
-            sendBuildStatusNotification(credentialsId, build, buildStatusResource, buildStatus, listener);
+            sendBuildStatusNotification(credentials, build, buildStatusResource, buildStatus, listener);
         }
     }
 
-    public static void sendBuildStatusNotification(final String credentialsId,
+    public static void sendBuildStatusNotification(final UsernamePasswordCredentials credentials,
                                                    final Run<?, ?> build,
                                                    final BitbucketBuildStatusResource buildStatusResource,
                                                    final BitbucketBuildStatus buildStatus,
                                                    final TaskListener listener) throws Exception {
-        UsernamePasswordCredentials credentials = getCredentials(credentialsId, build.getParent());
-
         if (credentials == null) {
             throw new Exception("Credentials could not be found!");
         }

src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifier.java

@@ -8,11 +8,7 @@
 import com.cloudbees.plugins.credentials.domains.URIRequirementBuilder;
 import hudson.Extension;
 import hudson.Launcher;
-import hudson.model.AbstractBuild;
-import hudson.model.AbstractProject;
-import hudson.model.BuildListener;
-import hudson.model.Item;
-import hudson.model.Job;
+import hudson.model.*;
 import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.BuildStepMonitor;
 import hudson.tasks.Notifier;
@@ -58,7 +54,17 @@ public boolean getNotifyFinish() {
     }
 
     public String getCredentialsId() {
-        return this.credentialsId;
+        return this.credentialsId != null ? this.credentialsId : this.getDescriptor().getGlobalCredentialsId();
+    }
+
+    private StandardUsernamePasswordCredentials getCredentials(AbstractBuild<?,?> build) {
+        StandardUsernamePasswordCredentials credentials = BitbucketBuildStatusHelper
+                .getCredentials(getCredentialsId(), build.getProject());
+        if (credentials == null) {
+            credentials = BitbucketBuildStatusHelper
+                    .getCredentials(this.getDescriptor().getGlobalCredentialsId(), null);
+        }
+        return credentials;
     }
 
     @Override
@@ -70,9 +76,8 @@ public boolean prebuild(AbstractBuild<?, ?> build, BuildListener listener) {
         logger.info("Bitbucket notify on start");
 
         try {
-            BitbucketBuildStatusHelper.notifyBuildStatus(getCredentialsId(), build, listener);
+            BitbucketBuildStatusHelper.notifyBuildStatus(this.getCredentials(build), build, listener);
         } catch (Exception e) {
-            logger.log(Level.INFO, "Bitbucket notify on start failed: " + e.getMessage(), e);
             listener.getLogger().println("Bitbucket notify on start failed: " + e.getMessage());
             e.printStackTrace(listener.getLogger());
         }
@@ -91,7 +96,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         logger.info("Bitbucket notify on finish");
 
         try {
-            BitbucketBuildStatusHelper.notifyBuildStatus(getCredentialsId(), build, listener);
+            BitbucketBuildStatusHelper.notifyBuildStatus(this.getCredentials(build), build, listener);
         } catch (Exception e) {
             logger.log(Level.INFO, "Bitbucket notify on finish failed: " + e.getMessage(), e);
             listener.getLogger().println("Bitbucket notify on finish failed: " + e.getMessage());

src/main/java/org/jenkinsci/plugins/bitbucket/BitbucketBuildStatusNotifierStep.java

@@ -24,10 +24,12 @@
 
 package org.jenkinsci.plugins.bitbucket;
 
+import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials;
 import com.google.inject.Inject;
 
 import hudson.Extension;
 import hudson.XmlFile;
+import hudson.model.AbstractBuild;
 import hudson.model.Run;
 import hudson.model.TaskListener;
 
@@ -54,9 +56,6 @@ public class BitbucketBuildStatusNotifierStep extends AbstractStepImpl {
 
     private String credentialsId;
     public String getCredentialsId() {
-        if (credentialsId == null) {
-            return getDescriptor().getGlobalCredentialsId();
-        }
         return this.credentialsId;
     }
 
@@ -96,6 +95,16 @@ public DescriptorImpl getDescriptor() {
         return Jenkins.getInstance().getDescriptorByType(DescriptorImpl.class);
     }
 
+    private StandardUsernamePasswordCredentials getCredentials(Run<?,?> build) {
+        StandardUsernamePasswordCredentials credentials = BitbucketBuildStatusHelper
+                .getCredentials(getCredentialsId(), build.getParent());
+        if (credentials == null) {
+            credentials = BitbucketBuildStatusHelper
+                    .getCredentials(this.getDescriptor().getGlobalCredentialsId(), null);
+        }
+        return credentials;
+    }
+
     @Extension
     public static class DescriptorImpl extends AbstractStepDescriptorImpl {
 
@@ -178,7 +187,7 @@ public Void run() throws Exception {
             BitbucketBuildStatus buildStatus = new BitbucketBuildStatus(buildState, buildKey, buildUrl, buildName,
                     buildDescription);
 
-            BitbucketBuildStatusHelper.notifyBuildStatus(step.getCredentialsId(), build, taskListener, buildStatus);
+            BitbucketBuildStatusHelper.notifyBuildStatus(step.getCredentials(build), build, taskListener, buildStatus);
 
             if(buildState.equals(BitbucketBuildStatus.FAILED)) {
                 throw new Exception(buildDescription);