fix: use correct command

Previously I used the merge branch command, this command requires different parameters and failed. By using the pull request merge action we fixed the behaviour.
conijnio · Feb 5, 2022 · 13d641b · 13d641b
1 parent bee8914
commit 13d641b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pull_request_codecommit/aws/client.py b/pull_request_codecommit/aws/client.py
@@ -64,7 +64,7 @@ def merge_pull_request(self, repository: str, pull_request_id: int) -> dict:
         response = self.__execute(
             [
                 "codecommit",
-                "merge-branches-by-fast-forward",
+                "merge-pull-request-by-fast-forward",
                 "--pull-request-id",
                 str(pull_request_id),
                 "--repository-name",

diff --git a/tests/test_command.py b/tests/test_command.py
@@ -22,7 +22,7 @@ def aws_client_execute_side_effect(parameters, stdout):
     if "create-pull-request" in parameters:
         data = {"pullRequest": {"pullRequestId": 1}}
 
-    elif "merge-branches-by-fast-forward" in parameters:
+    elif "merge-pull-request-by-fast-forward" in parameters:
         data = {"pullRequest": {"pullRequestStatus": "CLOSED"}}
 
     mock_stdout.stdout = bytes(json.dumps(data), "utf-8")