update gitea integration for 2023.05

Author: Turbocube644

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

@@ -17,6 +17,8 @@
 package jetbrains.buildServer.commitPublisher.gitea;
 
 import com.google.gson.Gson;
+
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -30,17 +32,18 @@
 import jetbrains.buildServer.util.StringUtil;
 import jetbrains.buildServer.vcs.VcsRoot;
 import jetbrains.buildServer.vcs.VcsRootInstance;
+import jetbrains.buildServer.vcshostings.http.HttpHelper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import static jetbrains.buildServer.commitPublisher.LoggerUtil.LOG;
 
-class GiteaPublisher extends HttpBasedCommitStatusPublisher {
+class GiteaPublisher extends HttpBasedCommitStatusPublisher<GiteaBuildStatus> {
 
   private static final Gson myGson = new Gson();
   private static final GitRepositoryParser VCS_URL_PARSER = new GitRepositoryParser();
 
-  private final CommitStatusesCache<GiteaCommitStatus> myStatusesCache;
+  @NotNull private final CommitStatusesCache<GiteaCommitStatus> myStatusesCache;
 
   GiteaPublisher(@NotNull CommitStatusPublisherSettings settings,
                  @NotNull SBuildType buildType, @NotNull String buildFeatureId,
@@ -74,8 +77,8 @@ public boolean buildQueued(@NotNull BuildPromotion buildPromotion, @NotNull Buil
 
   @Override
   public boolean buildRemovedFromQueue(@NotNull BuildPromotion buildPromotion, @NotNull BuildRevision revision, @NotNull AdditionalTaskInfo additionalTaskInfo) throws PublisherException {
-    GiteaBuildStatus targetStatus = additionalTaskInfo.isPromotionReplaced() ? GiteaBuildStatus.PENDING : GiteaBuildStatus.WARNING;
-    publish(buildPromotion, revision, targetStatus, additionalTaskInfo);
+    if (!additionalTaskInfo.isBuildManuallyRemoved()) return false;
+    publish(buildPromotion, revision, GiteaBuildStatus.WARNING , additionalTaskInfo);
     return true;
   }
 
@@ -125,8 +128,13 @@ RevisionStatus getRevisionStatusForRemovedBuild(@NotNull SQueuedBuild removedBui
       return null;
     }
     Event event = getTriggeredEvent(commitStatus);
-    boolean isSameBuild = StringUtil.areEqual(myLinks.getQueuedBuildUrl(removedBuild), commitStatus.target_url);
-    return new RevisionStatus(event, commitStatus.description, isSameBuild);
+    boolean isSameBuildType = StringUtil.areEqual(getBuildName(removedBuild.getBuildPromotion()), commitStatus.context);
+    return new RevisionStatus(event, commitStatus.description, isSameBuildType);
+  }
+
+  private String getBuildName(BuildPromotion promotion) {
+    SBuildType buildType = promotion.getBuildType();
+    return buildType != null ? buildType.getFullName() : promotion.getBuildTypeExternalId();
   }
 
   @Override
@@ -160,7 +168,7 @@ private GiteaCommitStatus[] loadGiteaStatuses(@NotNull BuildRevision revision, @
     String url = buildRevisionStatusesUrl(revision, buildType);
     url += "?access_token=" + getPrivateToken();
     ResponseEntityProcessor<GiteaCommitStatus[]> processor = new ResponseEntityProcessor<>(GiteaCommitStatus[].class);
-    GiteaCommitStatus[] commitStatuses = get(url, null, null, null, processor);
+    GiteaCommitStatus[] commitStatuses = get(url, null, null, processor);
     if (commitStatuses == null || commitStatuses.length == 0) {
       return new GiteaCommitStatus[0];
     }
@@ -173,8 +181,8 @@ RevisionStatus getRevisionStatus(@NotNull BuildPromotion buildPromotion, @Nullab
       return null;
     }
     Event event = getTriggeredEvent(commitStatus);
-    boolean isSameBuild = StringUtil.areEqual(getViewUrl(buildPromotion), commitStatus.target_url);
-    return new RevisionStatus(event, commitStatus.description, isSameBuild);
+    boolean isSameBuildType = StringUtil.areEqual(getBuildName(buildPromotion), commitStatus.context);
+    return new RevisionStatus(event, commitStatus.description, isSameBuildType);
   }
 
   private String buildRevisionStatusesUrl(@NotNull BuildRevision revision, @Nullable BuildType buildType) throws PublisherException {
@@ -225,8 +233,7 @@ private void publish(@NotNull SBuild build,
                        @NotNull BuildRevision revision,
                        @NotNull GiteaBuildStatus status,
                        @NotNull String description) throws PublisherException {
-    SBuildType buildType = build.getBuildType();
-    String buildName = buildType != null ? buildType.getFullName() : build.getBuildTypeExternalId();
+    String buildName = getBuildName(build.getBuildPromotion());
     String message = createMessage(status, buildName, revision, getViewUrl(build), description);
     publish(message, revision, LogUtil.describe(build));
     myStatusesCache.removeStatusFromCache(revision, buildName);
@@ -237,9 +244,13 @@ private void publish(@NotNull BuildPromotion buildPromotion,
                        @NotNull GiteaBuildStatus status,
                        @NotNull AdditionalTaskInfo additionalTaskInfo) throws PublisherException {
     String url = getViewUrl(buildPromotion);
+    if (url == null) {
+      LOG.debug(String.format("Can not build view URL for the build #%d. Probably build configuration was removed. Status \"%s\" won't be published",
+        buildPromotion.getId(), status.getName()));
+      return;
+    }
     String description = additionalTaskInfo.getComment();
-    SBuildType buildType = buildPromotion.getBuildType();
-    String buildName = buildType != null ? buildType.getFullName() : buildPromotion.getBuildTypeExternalId();
+    String buildName = getBuildName(buildPromotion);
     String message = createMessage(status, buildName, revision, url, description);
     publish(message, revision, LogUtil.describe(buildPromotion));
     myStatusesCache.removeStatusFromCache(revision, buildName);
@@ -269,15 +280,17 @@ private void publish(@NotNull String commit, @NotNull String data, @NotNull Repo
     String url = GiteaSettings.getProjectsUrl(getApiUrl(), repository.owner(), repository.repositoryName()) + "/statuses/" + commit;
     LOG.debug("Request url: " + url + ", message: " + data);
     url += "?access_token=" + getPrivateToken();
-    postJson(url, null, null, data, null, buildDescription);
+    postJson(url, null, data, null, buildDescription);
   }
 
   @Override
-  public void processResponse(HttpHelper.HttpResponse response) throws HttpPublisherException {
+  public void processResponse(HttpHelper.HttpResponse response) throws IOException, HttpPublisherException {
     final int statusCode = response.getStatusCode();
     if (statusCode >= 400) {
       String responseString = response.getContent();
-      if (!responseString.contains("Cannot transition status via :enqueue from :pending") &&
+      if (404 == statusCode) {
+        throw new HttpPublisherException(statusCode, "Repository not found. Please check if it was renamed or moved to another namespace");
+      } else if (!responseString.contains("Cannot transition status via :enqueue from :pending") &&
           !responseString.contains("Cannot transition status via :enqueue from :running") &&
           !responseString.contains("Cannot transition status via :run from :running")) {
         throw new HttpPublisherException(statusCode,
@@ -320,4 +333,12 @@ private String getPrivateToken() {
     return myParams.get(Constants.GITEA_TOKEN);
   }
 
+  /* Currently not needed
+   * determineStatusCommit
+   * getMergeRequest
+   * getParentRevisions
+   * determineParentInSourceBranch
+   * isOnlyInSourceBranch
+   * supportMergeResults
+   */
 }

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

@@ -24,6 +24,7 @@
 import jetbrains.buildServer.serverSide.*;
 import jetbrains.buildServer.util.ssl.SSLTrustStoreProvider;
 import jetbrains.buildServer.vcs.VcsRoot;
+import jetbrains.buildServer.vcshostings.http.HttpHelper;
 import jetbrains.buildServer.web.openapi.PluginDescriptor;
 import jetbrains.buildServer.web.util.WebUtil;
 import org.jetbrains.annotations.NotNull;
@@ -109,19 +110,24 @@ public void testConnection(@NotNull BuildTypeIdentity buildTypeOrTemplate, @NotN
           ProjectInfoResponseProcessor processorPrj = new ProjectInfoResponseProcessor();
           String url = getProjectsUrl(apiUrl, repository.owner(), repository.repositoryName());
           url += "?access_token=" + token;
-          HttpHelper.get(url, null, null, null,
+          HttpHelper.get(url, null, null,
                          BaseCommitStatusPublisher.DEFAULT_CONNECTION_TIMEOUT, trustStore(), processorPrj);
           if (!processorPrj.hasPushAccess()) {
             UserInfoResponseProcessor processorUser = new UserInfoResponseProcessor();
             url = getUserUrl(apiUrl);
             url += "?access_token=" + token;
-            HttpHelper.get(url, null, null, null,
+            HttpHelper.get(url, null, null,
                            BaseCommitStatusPublisher.DEFAULT_CONNECTION_TIMEOUT, trustStore(), processorUser);
             if (!processorUser.isAdmin()) {
               throw new HttpPublisherException("Gitea does not grant enough permissions to publish a commit status");
             }
           }
         });
+      } catch (HttpPublisherException pe) {
+        Integer statusCode = pe.getStatusCode();
+        if (Objects.equals(statusCode, 404)) {
+          throw new PublisherException(String.format("Repository \"%s\" can not be found. Please check if it was renamed or moved to another namespace", repository.repositoryName()));
+        }
       } catch (Exception ex) {
         throw new PublisherException(String.format("Gitea publisher has failed to connect to \"%s\" repository", repository.url()), ex);
       }

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

@@ -26,13 +26,12 @@
 import jetbrains.buildServer.commitPublisher.gitea.data.GiteaPermissions;
 import jetbrains.buildServer.commitPublisher.gitea.data.GiteaRepoInfo;
 import jetbrains.buildServer.messages.Status;
-import jetbrains.buildServer.serverSide.BuildPromotion;
-import jetbrains.buildServer.serverSide.BuildRevision;
-import jetbrains.buildServer.serverSide.SimpleParameter;
+import jetbrains.buildServer.serverSide.*;
 import jetbrains.buildServer.vcs.VcsRootInstance;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.entity.StringEntity;
+import org.jmock.Mock;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -141,12 +140,19 @@ public void should_calculate_correct_revision_status() {
   }
 
   public void should_define_correctly_if_event_allowed() {
-    MockQueuedBuild removedBuild = new MockQueuedBuild();
-    removedBuild.setBuildTypeId("buildType");
-    removedBuild.setItemId("123");
+    Mock removedBuildMock = new Mock(SQueuedBuild.class);
+    removedBuildMock.stubs().method("getBuildTypeId").withNoArguments().will(returnValue("buildType"));
+    removedBuildMock.stubs().method("getItemId").withNoArguments().will(returnValue("123"));
+    Mock buildPromotionMock = new Mock(BuildPromotion.class);
+    Mock buildTypeMock = new Mock(SBuildType.class);
+    buildTypeMock.stubs().method("getFullName").withNoArguments().will(returnValue("typeFullName"));
+    buildPromotionMock.stubs().method("getBuildType").withNoArguments().will(returnValue(buildTypeMock.proxy()));
+    removedBuildMock.stubs().method("getBuildPromotion").withNoArguments().will(returnValue(buildPromotionMock.proxy()));
+    SQueuedBuild removedBuild = (SQueuedBuild)removedBuildMock.proxy();
+
     GiteaPublisher publisher = (GiteaPublisher)myPublisher;
-    assertTrue(publisher.getRevisionStatusForRemovedBuild(removedBuild, new GiteaCommitStatus(null, GiteaBuildStatus.PENDING.getName(), DefaultStatusMessages.BUILD_QUEUED, null, "http://localhost/viewQueued.html?itemId=123")).isEventAllowed(CommitStatusPublisher.Event.REMOVED_FROM_QUEUE));
-    assertFalse(publisher.getRevisionStatusForRemovedBuild(removedBuild, new GiteaCommitStatus(null, GiteaBuildStatus.PENDING.getName(), DefaultStatusMessages.BUILD_QUEUED, null, "http://localhost/viewQueued.html?itemId=321")).isEventAllowed(CommitStatusPublisher.Event.REMOVED_FROM_QUEUE));
+    assertTrue(publisher.getRevisionStatusForRemovedBuild(removedBuild, new GiteaCommitStatus(null, GiteaBuildStatus.PENDING.getName(), DefaultStatusMessages.BUILD_QUEUED, "typeFullName", "http://localhost:8111/viewQueued.html?itemId=123")).isEventAllowed(CommitStatusPublisher.Event.REMOVED_FROM_QUEUE));
+    assertFalse(publisher.getRevisionStatusForRemovedBuild(removedBuild, new GiteaCommitStatus(null, GiteaBuildStatus.PENDING.getName(), DefaultStatusMessages.BUILD_QUEUED, "anotherTypeFullName", "http://localhost:8111/viewQueued.html?itemId=321")).isEventAllowed(CommitStatusPublisher.Event.REMOVED_FROM_QUEUE));
   }
 
   @BeforeMethod