From e9714f2343a671694f3a38e1e04044c43ffcde89 Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: May 24 2023 11:21:35 +0000 Subject: Use the full_url value instead of hardcoding pagure.io Fixes: #9 Signed-off-by: Aurélien Bompard --- diff --git a/pagure_messages/git_schema.py b/pagure_messages/git_schema.py index 2254686..3aa6c58 100644 --- a/pagure_messages/git_schema.py +++ b/pagure_messages/git_schema.py @@ -85,15 +85,14 @@ class GitBranchCreationV1(GitMessage): @property def url(self): - base_url = self.get_base_url() - fullname = self.body["repo"]["url_path"] + base_url = self.body["repo"]["full_url"] item = self.body["branch"] if "refs/heads/" in item: item = item.replace("refs/heads/", "") - tmpl = "{base_url}/{fullname}/tree/{item}" - return tmpl.format(base_url=base_url, fullname=fullname, item=item) + tmpl = "{base_url}/tree/{item}" + return tmpl.format(base_url=base_url, item=item) class GitBranchDeletionV1(GitMessage): @@ -137,11 +136,7 @@ class GitBranchDeletionV1(GitMessage): @property def url(self): - base_url = self.get_base_url() - fullname = self.body["repo"]["url_path"] - - tmpl = "{base_url}/{fullname}" - return tmpl.format(base_url=base_url, fullname=fullname) + return self.body["repo"]["full_url"] class GitReceiveV1(GitMessage): @@ -200,15 +195,14 @@ class GitReceiveV1(GitMessage): @property def url(self): - base_url = self.get_base_url() - fullname = self.body["repo"]["url_path"] + base_url = self.body["repo"]["full_url"] item = self.body["branch"] if "refs/heads/" in item: item = item.replace("refs/heads/", "") - tmpl = "{base_url}/{fullname}/tree/{item}" - return tmpl.format(base_url=base_url, fullname=fullname, item=item) + tmpl = "{base_url}/tree/{item}" + return tmpl.format(base_url=base_url, item=item) class GitTagCreationV1(GitMessage): @@ -253,12 +247,11 @@ class GitTagCreationV1(GitMessage): @property def url(self): - base_url = self.get_base_url() - fullname = self.body["repo"]["url_path"] + base_url = self.body["repo"]["full_url"] tag = self.body["tag"] - tmpl = "{base_url}/{fullname}/commits/{tag}" - return tmpl.format(base_url=base_url, fullname=fullname, tag=tag) + tmpl = "{base_url}/commits/{tag}" + return tmpl.format(base_url=base_url, tag=tag) class GitTagDeletionV1(GitMessage): @@ -303,8 +296,6 @@ class GitTagDeletionV1(GitMessage): @property def url(self): - base_url = self.get_base_url() - fullname = self.body["repo"]["url_path"] - - tmpl = "{base_url}/{fullname}/releases" - return tmpl.format(base_url=base_url, fullname=fullname) + base_url = self.body["repo"]["full_url"] + tmpl = "{base_url}/releases" + return tmpl.format(base_url=base_url) diff --git a/pagure_messages/project_schema.py b/pagure_messages/project_schema.py index 4e22275..8d45c60 100644 --- a/pagure_messages/project_schema.py +++ b/pagure_messages/project_schema.py @@ -168,7 +168,7 @@ class ProjectDeletedV1(PagureMessage): @property def url(self): - return self.get_base_url() + return self.body["project"]["full_url"] class ProjectGroupAddedV1(PagureMessage): diff --git a/pagure_messages/tests/test_git_branch_creation.py b/pagure_messages/tests/test_git_branch_creation.py index 43df6a0..65bc8b2 100644 --- a/pagure_messages/tests/test_git_branch_creation.py +++ b/pagure_messages/tests/test_git_branch_creation.py @@ -45,7 +45,7 @@ def test_minimal(): message = GitBranchCreationV1(body=body) message.validate() assert ( - message.url == "https://pagure.io/fedora-infra/fedocal-messages/" + message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages/" "tree/feature/awesome" ) @@ -71,7 +71,7 @@ def test_minimal_short_branch(): message = GitBranchCreationV1(body=body) message.validate() assert ( - message.url == "https://pagure.io/fedora-infra/fedocal-messages/" + message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages/" "tree/feature/awesome" ) diff --git a/pagure_messages/tests/test_git_branch_deletion.py b/pagure_messages/tests/test_git_branch_deletion.py index 8903be4..8f4c105 100644 --- a/pagure_messages/tests/test_git_branch_deletion.py +++ b/pagure_messages/tests/test_git_branch_deletion.py @@ -44,7 +44,7 @@ def test_minimal(): } message = GitBranchDeletionV1(body=body) message.validate() - assert message.url == "https://pagure.io/fedora-infra/fedocal-messages" + assert message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages" def test_missing_fields(): diff --git a/pagure_messages/tests/test_git_receive.py b/pagure_messages/tests/test_git_receive.py index e59f3c8..986d2e0 100644 --- a/pagure_messages/tests/test_git_receive.py +++ b/pagure_messages/tests/test_git_receive.py @@ -48,7 +48,10 @@ def test_minimal(): } message = GitReceiveV1(body=body) message.validate() - assert message.url == "https://pagure.io/fedora-infra/fedocal-messages/tree/develop" + assert ( + message.url + == "http://localhost.localdomain/fedora-infra/fedocal-messages/tree/develop" + ) assert message.packages == [] assert message.containers == [] assert message.modules == [] @@ -79,7 +82,10 @@ def test_minimal_short_branch(): } message = GitReceiveV1(body=body) message.validate() - assert message.url == "https://pagure.io/fedora-infra/fedocal-messages/tree/develop" + assert ( + message.url + == "http://localhost.localdomain/fedora-infra/fedocal-messages/tree/develop" + ) def test_missing_fields(): diff --git a/pagure_messages/tests/test_git_tag_creation.py b/pagure_messages/tests/test_git_tag_creation.py index f0b0e38..07a40de 100644 --- a/pagure_messages/tests/test_git_tag_creation.py +++ b/pagure_messages/tests/test_git_tag_creation.py @@ -45,7 +45,8 @@ def test_minimal(): message = GitTagCreationV1(body=body) message.validate() assert ( - message.url == "https://pagure.io/fedora-infra/fedocal-messages/commits/0.0.1" + message.url + == "http://localhost.localdomain/fedora-infra/fedocal-messages/commits/0.0.1" ) diff --git a/pagure_messages/tests/test_git_tag_deletion.py b/pagure_messages/tests/test_git_tag_deletion.py index 465c79f..32007f1 100644 --- a/pagure_messages/tests/test_git_tag_deletion.py +++ b/pagure_messages/tests/test_git_tag_deletion.py @@ -44,7 +44,10 @@ def test_minimal(): } message = GitTagDeletionV1(body=body) message.validate() - assert message.url == "https://pagure.io/fedora-infra/fedocal-messages/releases" + assert ( + message.url + == "http://localhost.localdomain/fedora-infra/fedocal-messages/releases" + ) def test_missing_fields(): diff --git a/pagure_messages/tests/test_project_deleted.py b/pagure_messages/tests/test_project_deleted.py index 2656c56..ce1b60d 100644 --- a/pagure_messages/tests/test_project_deleted.py +++ b/pagure_messages/tests/test_project_deleted.py @@ -34,7 +34,7 @@ def test_minimal(): } message = ProjectDeletedV1(body=body) message.validate() - assert message.url == "https://pagure.io" + assert message.url == "http://localhost.localdomain/fedora-infra/fedocal-messages" def test_missing_fields():