Infrastructure/toddlers
1
0
Fork 0
Code Issues 10 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Send json the correct way

Browse source 
During the manual testing was found out that the json wasn't sent the way the
pagure is expecting it (as string). So this commit adds json.dumps before
sending the payload itself.

It also fixes formatting of one message.

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
This commit is contained in:
Michal Konečný 2022-03-25 11:02:50 +01:00
parent 5d0d0490d2
commit 5cc824a7f4
4 changed files with 128 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/plugins/test_scm_request_processor.py
View file

@ -1499,9 +1499,9 @@ class TestCreateNewBranch:
message = (
"The branch in PDC already exists, you can now create it yourself as follows:\n"
"Check in the project's settings if you have activated the git hook preventing"
"Check in the project's settings if you have activated the git hook preventing "
"new git branches from being created and if you did, de-activate it.\n"
"Then simply run in cloned repository: "
"Then simply run in cloned repository:\n"
"``git checkout -b <branch_name> && git push -u origin <branch_name>``.\n"
"``<branch_name>`` is the name of the branch you requested. \n"
"You only need to do this once and you can then use fedpkg as you normally do."

87
tests/utils/test_pagure.py
View file

@ -1,6 +1,7 @@
"""
Unit tests for `toddlers.utils.pagure`.
"""
import json
from unittest.mock import call, Mock, patch
import pytest
@ -177,8 +178,8 @@ class TestPagureCloseIssue:
self.pagure.close_issue(issue_id, namespace, message, reason)
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/test/issue/100/status",
data={"status": reason},
"https://pagure.io/api/0/test/issue/100/status",
data=json.dumps({"status": reason}),
headers=self.pagure.get_auth_header(),
)
@ -206,8 +207,8 @@ class TestPagureCloseIssue:
self.pagure.close_issue(issue_id, namespace, message, reason)
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/test/issue/100/status",
data={"status": reason},
"https://pagure.io/api/0/test/issue/100/status",
data=json.dumps({"status": reason}),
headers=self.pagure.get_auth_header(),
)
@ -245,7 +246,7 @@ class TestPagureAddCommentToIssue:
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/api/0/test/issue/100/comment",
data={"comment": message},
data=json.dumps({"comment": message}),
headers=self.pagure.get_auth_header(),
)
@ -269,7 +270,7 @@ class TestPagureAddCommentToIssue:
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/api/0/test/issue/100/comment",
data={"comment": message},
data=json.dumps({"comment": message}),
headers=self.pagure.get_auth_header(),
)
@ -388,14 +389,16 @@ class TestPagureNewProject:
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/api/0/new",
data={
data=json.dumps(
{
"namespace": namespace,
"name": repo,
"default_branch": default_branch,
"description": description,
"url": upstream_url,
"wait": True,
},
}
),
headers=self.pagure.get_auth_header(),
)
@ -425,7 +428,8 @@ class TestPagureNewProject:
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/api/0/new",
data={
data=json.dumps(
{
"namespace": namespace,
"name": repo,
"default_branch": default_branch,
@ -433,7 +437,8 @@ class TestPagureNewProject:
"url": upstream_url,
"wait": True,
"create_readme": True,
},
}
),
headers=self.pagure.get_auth_header(),
)
@ -467,7 +472,8 @@ class TestPagureNewProject:
[
call(
"https://pagure.io/api/0/new",
data={
data=json.dumps(
{
"namespace": namespace,
"name": repo,
"default_branch": default_branch,
@ -475,17 +481,20 @@ class TestPagureNewProject:
"url": upstream_url,
"wait": True,
"create_readme": True,
},
}
),
headers=self.pagure.get_auth_header(),
),
call(
"https://pagure.io/api/0/{0}/{1}/git/alias/new".format(
namespace, repo
),
data={
data=json.dumps(
{
"alias_from": "main",
"alias_to": "rawhide",
},
}
),
headers=self.pagure.get_auth_header(),
),
]
@ -520,7 +529,8 @@ class TestPagureNewProject:
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/api/0/new",
data={
data=json.dumps(
{
"namespace": namespace,
"name": repo,
"default_branch": default_branch,
@ -528,7 +538,8 @@ class TestPagureNewProject:
"url": upstream_url,
"wait": True,
"create_readme": True,
},
}
),
headers=self.pagure.get_auth_header(),
)
@ -556,14 +567,16 @@ class TestPagureNewProject:
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/api/0/new",
data={
data=json.dumps(
{
"namespace": namespace,
"name": repo,
"default_branch": default_branch,
"description": description,
"url": upstream_url,
"wait": True,
},
}
),
headers=self.pagure.get_auth_header(),
)
@ -608,7 +621,8 @@ class TestPagureNewProject:
[
call(
"https://pagure.io/api/0/new",
data={
data=json.dumps(
{
"namespace": namespace,
"name": repo,
"default_branch": default_branch,
@ -616,17 +630,20 @@ class TestPagureNewProject:
"url": upstream_url,
"wait": True,
"create_readme": True,
},
}
),
headers=self.pagure.get_auth_header(),
),
call(
"https://pagure.io/api/0/{0}/{1}/git/alias/new".format(
namespace, repo
),
data={
data=json.dumps(
{
"alias_from": "main",
"alias_to": "rawhide",
},
}
),
headers=self.pagure.get_auth_header(),
),
]
@ -667,10 +684,12 @@ class TestPagureNewBranch:
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/api/0/{0}/{1}/git/branch".format(namespace, repo),
data={
data=json.dumps(
{
"branch": branch,
"from_commit": from_commit,
},
}
),
headers=self.pagure.get_auth_header(),
)
@ -692,10 +711,12 @@ class TestPagureNewBranch:
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/api/0/{0}/{1}/git/branch".format(namespace, repo),
data={
data=json.dumps(
{
"branch": branch,
"from_branch": from_branch,
},
}
),
headers=self.pagure.get_auth_header(),
)
@ -768,10 +789,12 @@ class TestPagureNewBranch:
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/api/0/{0}/{1}/git/branch".format(namespace, repo),
data={
data=json.dumps(
{
"branch": branch,
"from_branch": from_branch,
},
}
),
headers=self.pagure.get_auth_header(),
)
@ -809,7 +832,7 @@ class TestPagureSetMonitoringStatus:
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/_dg/anitya/{0}/{1}".format(namespace, repo),
data={"anitya_status": monitoring_level},
data=json.dumps({"anitya_status": monitoring_level}),
headers=self.pagure.get_auth_header(),
)
@ -835,7 +858,7 @@ class TestPagureSetMonitoringStatus:
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/_dg/anitya/{0}/{1}".format(namespace, repo),
data={"anitya_status": monitoring_level},
data=json.dumps({"anitya_status": monitoring_level}),
headers=self.pagure.get_auth_header(),
)
@ -873,7 +896,7 @@ class TestPagureChangeProjectMainAdmin:
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/api/0/{0}/{1}".format(namespace, repo),
data={"main_admin": main_admin},
data=json.dumps({"main_admin": main_admin}),
headers=self.pagure.get_auth_header(),
)
@ -899,7 +922,7 @@ class TestPagureChangeProjectMainAdmin:
self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/api/0/{0}/{1}".format(namespace, repo),
data={"main_admin": main_admin},
data=json.dumps({"main_admin": main_admin}),
headers=self.pagure.get_auth_header(),
)

12
toddlers/plugins/scm_request_processor.py
View file

@ -44,6 +44,14 @@ INVALID_EPEL_ERROR = (
_log = logging.getLogger(__name__)
# Currently there is no way to generate PDC API token on either
# pdc.stg.fedoraproject.org or pdc.fedoraproject.org
# So let's keep this here to be able to at least mock pdc calls
# when testing.
# When using this comment out the pdc.set_pdc line in process method
# from unittest.mock import Mock
# pdc = Mock()
class SCMRequestProcessor(ToddlerBase):
"""
@ -686,9 +694,9 @@ class SCMRequestProcessor(ToddlerBase):
if pdc_branch:
ticket_text = (
"The branch in PDC already exists, you can now create it yourself as follows:\n"
"Check in the project's settings if you have activated the git hook preventing"
"Check in the project's settings if you have activated the git hook preventing "
"new git branches from being created and if you did, de-activate it.\n"
"Then simply run in cloned repository: "
"Then simply run in cloned repository:\n"
"``git checkout -b <branch_name> && git push -u origin <branch_name>``.\n"
"``<branch_name>`` is the name of the branch you requested. \n"
"You only need to do this once and you can then use fedpkg as you normally do."

19
toddlers/utils/pagure.py
View file

@ -15,6 +15,7 @@ Examples:
pagure_io.close_issue("<repo>", <issue_id>)
"""
import json
import logging
from typing import Any, Optional
@ -137,7 +138,9 @@ class Pagure:
toddlers.utils.exceptions.PagureError when the issue couldn't be closed.
"""
issue_url = "{0}/{1}/issue/{2}".format(self._pagure_url, namespace, issue_id)
api_url = "{0}/status".format(issue_url)
api_url = "{0}/api/0/{1}/issue/{2}/status".format(
self._pagure_url, namespace, issue_id
)
status_payload = {"status": reason}
headers = self.get_auth_header()
@ -150,7 +153,7 @@ class Pagure:
)
)
response = self._requests_session.post(
api_url, data=status_payload, headers=headers
api_url, data=json.dumps(status_payload), headers=headers
)
if response.status_code == 200:
@ -187,7 +190,7 @@ class Pagure:
"Commenting on issue '{0}' with message '{1}'".format(issue_url, comment)
)
response = self._requests_session.post(
api_url, data=comment_payload, headers=headers
api_url, data=json.dumps(comment_payload), headers=headers
)
if response.status_code == 200:
@ -271,7 +274,7 @@ class Pagure:
log.debug("Creating project '{0}/{1}'".format(namespace, repo))
response = self._requests_session.post(
pagure_new_project_url, data=payload, headers=headers
pagure_new_project_url, data=json.dumps(payload), headers=headers
)
if response.status_code != 200:
@ -300,7 +303,7 @@ class Pagure:
"Creating alias for project '{0}/{1}'".format(namespace, repo)
)
response = self._requests_session.post(
pagure_new_git_alias_url, data=payload, headers=headers
pagure_new_git_alias_url, data=json.dumps(payload), headers=headers
)
if response.status_code != 200:
@ -360,7 +363,7 @@ class Pagure:
log.debug("Creating branch for project '{0}/{1}'".format(namespace, repo))
response = self._requests_session.post(
branch_api_url, data=payload, headers=headers
branch_api_url, data=json.dumps(payload), headers=headers
)
if response.status_code != 200:
@ -402,7 +405,7 @@ class Pagure:
)
)
response = self._requests_session.post(
monitoring_api_url, data=payload, headers=headers
monitoring_api_url, data=json.dumps(payload), headers=headers
)
if response.status_code != 200:
@ -439,7 +442,7 @@ class Pagure:
)
)
response = self._requests_session.post(
admin_api_url, data=payload, headers=headers
admin_api_url, data=json.dumps(payload), headers=headers
)
if response.status_code != 200: