Merge pull request #66 from jpopelka/handle_existing_dist-git_pr

Improve code added in #62

I initially wanted to attach these refactoring commits to some other PR, but I think they'll be better on their own.

Reviewed-by: None <None>
Reviewed-by: Jiri Popelka <None>

Author: softwarefactory-project-zuul[bot]

Makefile

@@ -47,7 +47,6 @@ check-in-container:
 		--env COV_REPORT \
 		--env TEST_TARGET \
 		--env COLOR \
-		-v $(CURDIR):/src \
+		-v $(CURDIR):/src:Z \
 		-w /src \
-		--security-opt label=disable \
 		$(TEST_IMAGE) make check "TEST_TARGET=$(TEST_TARGET)"

hardly/handlers/distgit.py

@@ -108,18 +108,52 @@ def packit(self) -> PackitAPI:
             )
         return self._packit
 
+    def handle_existing_dist_git_pr(self) -> bool:
+        """Sync changes in source-git PR to already existing dist-git PR.
+
+        Returns:
+            was the sync successful
+        """
+        logger.info(
+            f"{self.source_git_pr_model} already has corresponding {self.dist_git_pr_model}"
+        )
+        if self.dist_git_pr:
+            msg = ""
+            if self.action == GitlabEventAction.closed.value:
+                msg = f"[Source-git MR]({self.mr_url}) has been closed."
+                self.dist_git_pr.close()
+            elif self.action == GitlabEventAction.reopen.value:
+                msg = f"[Source-git MR]({self.mr_url}) has been reopened."
+                # https://github.com/packit/ogr/pull/714
+                # self.dist_git_pr.reopen()
+            elif self.action == GitlabEventAction.update.value:
+                msg = f"[Source-git MR]({self.mr_url}) has been updated."
+                # TODO: update the dist-git PR?
+            elif self.action == GitlabEventAction.opened.value:
+                # Are you trying to re-send a webhook payload to the endpoint manually?
+                # If so and you expect a new dist-git PR being opened, you first
+                # have to remove the old relation from db.
+                logger.error(f"[Source-git MR]({self.mr_url}) opened. (again???)")
+                return False
+            logger.info(msg)
+            self.dist_git_pr.comment(msg)
+        return True
+
     def run(self) -> TaskResults:
         """
         If user creates a merge-request on the source-git repository,
         create a matching merge-request to the dist-git repository.
         """
         if not self.handle_target():
             logger.debug(
-                "Not creating a dist-git MR from "
+                "Not creating/updating a dist-git MR from "
                 f"{self.target_repo}:{self.target_repo_branch}"
             )
             return TaskResults(success=True)
 
+        if self.dist_git_pr_model:
+            return TaskResults(success=self.handle_existing_dist_git_pr())
+
         if not self.package_config:
             logger.debug("No package config found.")
             return TaskResults(success=True)
@@ -137,25 +171,6 @@ def run(self) -> TaskResults:
             logger.info(msg)
             return TaskResults(success=True)
 
-        if self.dist_git_pr_model:
-            logger.info(
-                f"{self.source_git_pr_model} already has corresponding {self.dist_git_pr_model}"
-            )
-            if self.dist_git_pr:
-                if self.action == GitlabEventAction.closed.value:
-                    msg = f"[Source-git MR]({self.mr_url}) has been closed."
-                    self.dist_git_pr.close()
-                elif self.action == GitlabEventAction.reopen.value:
-                    msg = f"[Source-git MR]({self.mr_url}) has been reopened."
-                    # https://github.com/packit/ogr/pull/714
-                    # self.dist_git_pr.reopen()
-                else:
-                    logger.error(f"Unknown action {self.action}")
-                    return TaskResults(success=False)
-                logger.info(msg)
-                self.dist_git_pr.comment(msg)
-            return TaskResults(success=True)
-
         dg_mr_info = f"""###### Info for package maintainer
 This MR has been automatically created from
 [this source-git MR]({self.mr_url})."""