fallback to build if gitscm not found in job

jenkinsci · Apr 3, 2023 · fbfc326 · fbfc326
1 parent b39eda4
commit fbfc326
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/main/java/io/jenkins/plugins/checks/github/SCMFacade.java b/src/main/java/io/jenkins/plugins/checks/github/SCMFacade.java
@@ -2,6 +2,7 @@
 
 import com.cloudbees.plugins.credentials.CredentialsMatchers;
 import com.cloudbees.plugins.credentials.CredentialsProvider;
+import com.cloudbees.plugins.credentials.domains.DomainRequirement;
 import com.cloudbees.plugins.credentials.domains.URIRequirementBuilder;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.model.AbstractProject;
@@ -123,16 +124,29 @@ UserRemoteConfig getUserRemoteConfig(final GitSCM scm) {
      * @return the found GitHub App credentials or empty
      */
     public Optional<GitHubAppCredentials> findGitHubAppCredentials(final Job<?, ?> job, final String credentialsId) {
+        List<DomainRequirement> repoUrl = getDomainRequirements(job);
         List<GitHubAppCredentials> credentials = Collections.singletonList(CredentialsProvider.findCredentialById(
                 credentialsId,
                 GitHubAppCredentials.class,
                 job.getLastBuild(),
-                URIRequirementBuilder.fromUri(getUserRemoteConfig((GitSCM) this.getScm(job)).getUrl()).build()));
+                repoUrl));
         GitHubAppCredentials appCredentials =
                 CredentialsMatchers.firstOrNull(credentials, CredentialsMatchers.withId(credentialsId));
         return Optional.ofNullable(appCredentials);
     }
 
+    private List<DomainRequirement> getDomainRequirements(Job<?, ?> job) {
+        Optional<GitSCM> scmFromJob = findGitSCM(job);
+        Optional<GitSCM> scmFromBuild = findGitSCM(job.getLastBuild());
+        List<DomainRequirement> repoUrl = null;
+        if (scmFromJob.isPresent()) {
+            repoUrl = URIRequirementBuilder.fromUri(getUserRemoteConfig(scmFromJob.get()).getUrl()).build();
+        } else if (scmFromBuild.isPresent()) {
+            repoUrl = URIRequirementBuilder.fromUri(getUserRemoteConfig(scmFromBuild.get()).getUrl()).build();
+        }
+        return repoUrl;
+    }
+
     /**
      * Find {@link SCMHead} (or branch) used by the {@code job}.
      *