Skip to content

Commit 61b5ebc

Browse files
committed
fix: apply proper query param encoding everywhere
1 parent 4e5c448 commit 61b5ebc

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

sw360/packages.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -------------------------------------------------------------------------------
2-
# Copyright (c) 2024 Siemens
2+
# Copyright (c) 2024-2025 Siemens
33
# All Rights Reserved.
44
# Authors: thomas.graf@siemens.com
55
#
@@ -67,7 +67,7 @@ def get_all_packages(self, name: str = "", version: str = "", purl: str = "",
6767
"""
6868
fullbase_url = self.url + "resource/api/packages"
6969
params = {}
70-
70+
7171
if all_details:
7272
params["allDetails"] = "true"
7373

@@ -79,7 +79,7 @@ def get_all_packages(self, name: str = "", version: str = "", purl: str = "",
7979

8080
if purl:
8181
params["purl"] = purl
82-
82+
8383
if page > -1:
8484
params["page"] = str(page)
8585
params["page_entries"] = str(page_size)
@@ -123,7 +123,8 @@ def get_packages_by_packagemanager(self, manager: str, page: int = -1,
123123
if sort:
124124
params["sort"] = sort
125125

126-
resp = self.api_get(fullbase_url)
126+
full_url = self._add_params(fullbase_url, params)
127+
resp = self.api_get(full_url)
127128

128129
if page == -1 and resp and ("_embedded" in resp) and ("sw360:packages" in resp["_embedded"]):
129130
return resp["_embedded"]["sw360:packages"]

sw360/vendor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def create_new_vendor(self, vendor: Dict[str, Any]) -> Dict[str, Any]:
5252
5353
API endpoint: POST /vendors
5454
55-
:param vendor: the new vedor data
55+
:param vendor: the new vendor data
5656
:type vendor: JSON vendor object
5757
:raises SW360Error: if there is a negative HTTP response
5858
"""

tests/test_sw360_packages.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def test_get_packages_by_packagemanager_with_details(self) -> None:
202202
adding_headers={"Authorization": "Token " + self.MYTOKEN},
203203
)
204204

205-
packages = lib.get_packages_by_packagemanager("nuget", page=1, page_size=5, sort="name%2Cdesc")
205+
packages = lib.get_packages_by_packagemanager("nuget", page=1, page_size=5, sort="name,desc")
206206
self.assertIsNotNone(packages)
207207
self.assertTrue(len(packages) > 0)
208208
pkgs = packages["_embedded"]["sw360:packages"]
@@ -410,4 +410,4 @@ def test_delete_package_failed(self) -> None:
410410

411411
if __name__ == "__main__":
412412
APP = Sw360TestPackages()
413-
APP.test_get_packages_by_packagemanager()
413+
APP.test_get_packages_by_packagemanager_with_details()

0 commit comments

Comments
 (0)