TW-84882: review comment: try to determine a proper VCS root instance for Space fallback revision, fix the warn log message

TW-84882: review comment: don't rely on the build configuration when determining VCS root instance to be used for the fallback revision

TW-84882: review comment: try to determine a proper VCS root instance for Space fallback revision, fix the warn log message


Merge-request: TC-MR-8118
Merged-by: Andreas Eisele <[email protected]>

Author: aeisele

commit-status-publisher-server/src/main/java/jetbrains/buildServer/commitPublisher/BaseCommitStatusPublisher.java

@@ -109,7 +109,7 @@ public void setConnectionTimeout(int timeout) {
 
   @NotNull
   @Override
-  public Collection<BuildRevision> getFallbackRevisions() {
+  public Collection<BuildRevision> getFallbackRevisions(@Nullable SBuild build) {
     return Collections.emptyList();
   }
 

commit-status-publisher-server/src/main/java/jetbrains/buildServer/commitPublisher/CommitStatusPublisher.java

@@ -77,10 +77,11 @@ public interface CommitStatusPublisher {
    * Currently only {@link jetbrains.buildServer.commitPublisher.space.SpacePublisher} supports this.
    * </p>
    *
+   * @param build the current build, if any
    * @return empty collection if this publisher doesn't support fallback revisions
    */
   @NotNull
-  Collection<BuildRevision> getFallbackRevisions();
+  Collection<BuildRevision> getFallbackRevisions(@Nullable SBuild build);
 
   enum Event {
     STARTED("buildStarted", EventPriority.FIRST, true), FINISHED("buildFinished", true),

commit-status-publisher-server/src/main/java/jetbrains/buildServer/commitPublisher/CommitStatusPublisherListener.java

@@ -645,7 +645,7 @@ private boolean shouldFailBuild(@NotNull SBuildType buildType) {
   private Collection<BuildRevision> getQueuedBuildRevisionForVote(@NotNull BuildType buildType,
                                                             @NotNull CommitStatusPublisher publisher,
                                                             @NotNull BuildPromotion buildPromotion) {
-    if (buildPromotion.isFailedToCollectChanges()) return publisher.getFallbackRevisions();
+    if (buildPromotion.isFailedToCollectChanges()) return publisher.getFallbackRevisions(buildPromotion.getAssociatedBuild());
 
     if (!((BuildPromotionEx)buildPromotion).isChangeCollectingNeeded(false)) {
       return getBuildRevisionForVote(publisher, buildPromotion.getRevisions());
@@ -834,7 +834,7 @@ public RetryInfo publish(Event event, BuildRevision revision, CommitStatusPublis
 
         @Override
         public Collection<BuildRevision> getRevisions(BuildType buildType, CommitStatusPublisher publisher) {
-          if (buildPromotion.isFailedToCollectChanges()) return publisher.getFallbackRevisions();
+          if (buildPromotion.isFailedToCollectChanges()) return publisher.getFallbackRevisions(build);
           return getBuildRevisionForVote(publisher, build.getRevisions());
         }
       };

commit-status-publisher-server/src/main/java/jetbrains/buildServer/commitPublisher/space/SpacePublisher.java

@@ -28,8 +28,7 @@
 import jetbrains.buildServer.serverSide.impl.LogUtil;
 import jetbrains.buildServer.serverSide.oauth.space.SpaceConnectDescriber;
 import jetbrains.buildServer.util.StringUtil;
-import jetbrains.buildServer.vcs.VcsModification;
-import jetbrains.buildServer.vcs.VcsRootInstance;
+import jetbrains.buildServer.vcs.*;
 import jetbrains.buildServer.vcshostings.http.HttpHelper;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.http.HttpHeaders;
@@ -382,16 +381,33 @@ public void processResponse(HttpHelper.HttpResponse response) throws HttpPublish
    * Space is able to match safe-merge statuses by build ID.
    * See: TW-84882
    *
+   * @param build the current build
    * @return singleton collection of an artificial build revision pointing to {@link #UNKNWON_GIT_SHA}
    */
   @NotNull
   @Override
-  public Collection<BuildRevision> getFallbackRevisions() {
-    final List<VcsRootInstance> vcsRootInstances = myBuildType.getVcsRootInstances();
-    if (vcsRootInstances.isEmpty()) {
-      LOG.warn("unable to construct fallback build revision for Space build " + LogUtil.describe(myBuildType) + ": no VCS root instances found");
-      return super.getFallbackRevisions();
+  public Collection<BuildRevision> getFallbackRevisions(@Nullable SBuild build) {
+    if (build == null) {
+      return super.getFallbackRevisions(null);
     }
-    return Collections.singletonList(new BuildRevision(vcsRootInstances.get(0), UNKNWON_GIT_SHA, "", UNKNWON_GIT_SHA));
+
+    final String vcsRootId = getVcsRootId();
+    final Optional<VcsRootInstance> maybeVcsRootInstance = build.getVcsRootEntries()
+                                                                .stream()
+                                                                .map(VcsRootInstanceEntry::getVcsRoot)
+                                                                .filter(
+                                                                  vcsRootInstance -> (vcsRootId != null && vcsRootIdMatches(vcsRootId, (SVcsRootEx)vcsRootInstance.getParent())) ||
+                                                                                     getSettings().isPublishingForVcsRoot(vcsRootInstance))
+                                                                .findAny();
+
+    if (!maybeVcsRootInstance.isPresent()) {
+      LOG.warn("Unable to construct fallback build revision for Space build " + LogUtil.describe(build) + ": no suitable VCS root instance found");
+      return super.getFallbackRevisions(build);
+    }
+    return Collections.singletonList(new BuildRevision(maybeVcsRootInstance.get(), UNKNWON_GIT_SHA, "", UNKNWON_GIT_SHA));
+  }
+
+  private static boolean vcsRootIdMatches(@NotNull String vcsRootId, @NotNull SVcsRootEx root) {
+    return (vcsRootId.equals(root.getExternalId()) || root.isAliasExternalId(vcsRootId) || vcsRootId.equals(String.valueOf(root.getId())));
   }
 }

commit-status-publisher-server/src/test/java/jetbrains/buildServer/commitPublisher/MockPublisher.java

@@ -369,7 +369,7 @@ public int compareTo(@NotNull Object o) {
 
   @NotNull
   @Override
-  public Collection<BuildRevision> getFallbackRevisions() {
+  public Collection<BuildRevision> getFallbackRevisions(@Nullable SBuild build) {
     return myFallbackRevisions;
   }