[JENKINS-73471] Git scm.userRemoteConfigs.credentialsId configured by…

… Bitbucket is null (#899)

Set the credentialsId returned by the authenticator for SCM.
In case of SSH Trait is set git SCM credential to null to re-apply patch jenkinsci/git-plugin#1649

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

@@ -965,9 +965,12 @@ private BitbucketCommit findPRDestinationCommit(BitbucketPullRequest pr, TaskLis
     public SCM build(SCMHead head, SCMRevision revision) {
         initCloneLinks();
 
+        boolean sshAuth = traits.stream()
+                .anyMatch(SSHCheckoutTrait.class::isInstance);
+
         BitbucketAuthenticator authenticator = authenticator();
         return new BitbucketGitSCMBuilder(this, head, revision, null)
-                .withExtension(authenticator == null ? null : new GitClientAuthenticatorExtension(authenticator.getCredentialsForScm()))
+                .withExtension(authenticator == null || sshAuth ? null : new GitClientAuthenticatorExtension(authenticator.getCredentialsForSCM()))
                 .withCloneLinks(primaryCloneLinks, mirrorCloneLinks)
                 .withTraits(traits)
                 .build();

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/BitbucketAuthenticator.java

@@ -114,7 +114,7 @@ public void configureRequest(HttpRequest request) {
      *
      * @return credentials to be passed to {@link org.jenkinsci.plugins.gitclient.GitClient#setCredentials(StandardUsernameCredentials)}
      */
-    public StandardUsernameCredentials getCredentialsForScm() {
+    public StandardUsernameCredentials getCredentialsForSCM() {
         return null;
     }
 

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/credentials/BitbucketAccessTokenAuthenticator.java

@@ -38,10 +38,10 @@ public void configureRequest(HttpRequest request) {
     }
 
     @Override
-    public StandardUsernameCredentials getCredentialsForScm() {
+    public StandardUsernameCredentials getCredentialsForSCM() {
         try {
             return new UsernamePasswordCredentialsImpl(
-                    CredentialsScope.GLOBAL, null, null, StringUtils.EMPTY, token.getPlainText());
+                    CredentialsScope.GLOBAL, getId(), null, StringUtils.EMPTY, token.getPlainText());
         } catch (FormException e) {
             throw new RuntimeException(e);
         }

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/credentials/BitbucketOAuthAuthenticator.java

@@ -40,10 +40,10 @@ public void configureRequest(HttpRequest request) {
     }
 
     @Override
-    public StandardUsernameCredentials getCredentialsForScm() {
+    public StandardUsernameCredentials getCredentialsForSCM() {
         try {
             return new UsernamePasswordCredentialsImpl(
-                    CredentialsScope.GLOBAL, null, null, StringUtils.EMPTY, token.getToken());
+                    CredentialsScope.GLOBAL, getId(), null, StringUtils.EMPTY, token.getToken());
         } catch (FormException e) {
             throw new RuntimeException(e);
         }

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/credentials/BitbucketUsernamePasswordAuthenticator.java

@@ -80,10 +80,10 @@ public void configureContext(HttpClientContext context, HttpHost host) {
     }
 
     @Override
-    public StandardUsernameCredentials getCredentialsForScm() {
+    public StandardUsernameCredentials getCredentialsForSCM() {
         try {
             return new UsernamePasswordCredentialsImpl(
-                    CredentialsScope.GLOBAL, null, null, httpCredentials.getUserName(), httpCredentials.getPassword());
+                    CredentialsScope.GLOBAL, getId(), null, httpCredentials.getUserName(), httpCredentials.getPassword());
         } catch (FormException e) {
             throw new RuntimeException(e);
         }