Skip to content

Commit f27ae63

Browse files
dacoburndacoburn
committed
Fixed debug output
1 parent 62358c1 commit f27ae63

File tree

14 files changed

+27
-66
lines changed

14 files changed

+27
-66
lines changed

‎socketdev/core/dedupe.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from collections import defaultdict
22
from typing import Dict, List, Any
3+
from socketdev.log import log
34

45

56
class Dedupe:
@@ -100,5 +101,5 @@ def consolidate_by_order(packages: List[Dict[str, Any]]) -> dict[int, list[dict[
100101
pkg["batchIndex"] = batch_index
101102
grouped[pkg["batchIndex"]].append(pkg)
102103
except Exception as error:
103-
print(error)
104+
log.error(error)
104105
return grouped

‎socketdev/export/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def cdx_bom(
4747
# TODO: Add typed response when types are defined
4848

4949
log.error(f"Error exporting CDX BOM: {response.status_code}")
50-
print(response.text)
50+
log.error(response.text)
5151
return {}
5252

5353
def spdx_bom(
@@ -71,5 +71,5 @@ def spdx_bom(
7171
# TODO: Add typed response when types are defined
7272

7373
log.error(f"Error exporting SPDX BOM: {response.status_code}")
74-
print(response.text)
74+
log.error(response.text)
7575
return {}

‎socketdev/labels/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def post(self, org_slug: str, label_name: str) -> dict:
7373
return result
7474

7575
error_message = response.json().get("error", {}).get("message", "Unknown error")
76-
print(f"Failed to create repository label: {response.status_code}, message: {error_message}")
76+
log.error(f"Failed to create repository label: {response.status_code}, message: {error_message}")
7777
return {}
7878

7979
def get(self, org_slug: str, label_id: str) -> dict:
@@ -84,7 +84,7 @@ def get(self, org_slug: str, label_id: str) -> dict:
8484
return result
8585

8686
error_message = response.json().get("error", {}).get("message", "Unknown error")
87-
print(f"Failed to get repository label: {response.status_code}, message: {error_message}")
87+
log.error(f"Failed to get repository label: {response.status_code}, message: {error_message}")
8888
return {}
8989

9090
def delete(self, org_slug: str, label_id: str) -> dict:

‎socketdev/licensemetadata/__init__.py‎

Lines changed: 5 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import json
22
import logging
3-
3+
import urllib.parse
44

55
log = logging.getLogger("socketdev")
66

@@ -9,8 +9,11 @@ class LicenseMetadata:
99
def __init__(self, api):
1010
self.api = api
1111

12-
def post(self, licenses: list) -> dict:
12+
def post(self, licenses: list, params: dict = None) -> dict:
1313
path = f"license-metadata"
14+
if params:
15+
query_args = urllib.parse.urlencode(params)
16+
path += f"?{query_args}"
1417
payload = json.dumps(licenses)
1518
response = self.api.do_request(path=path, method="POST", payload=payload)
1619

@@ -22,46 +25,3 @@ def post(self, licenses: list) -> dict:
2225
log.error(f"Failed to create license metadata: {response.status_code}, message: {error_message}")
2326
return {}
2427

25-
def get(self, org_slug: str, label_id: str) -> dict:
26-
path = f"orgs/{org_slug}/repos/labels/{label_id}"
27-
response = self.api.do_request(path=path)
28-
if response.status_code == 200:
29-
result = response.json()
30-
return result
31-
32-
error_message = response.json().get("error", {}).get("message", "Unknown error")
33-
log.error(f"Failed to get repository label: {response.status_code}, message: {error_message}")
34-
return {}
35-
36-
def delete(self, org_slug: str, label_id: str) -> dict:
37-
path = f"orgs/{org_slug}/repos/labels/{label_id}"
38-
response = self.api.do_request(path=path, method="DELETE")
39-
if response.status_code == 200:
40-
return response.json()
41-
42-
error_message = response.json().get("error", {}).get("message", "Unknown error")
43-
log.error(f"Error deleting repository label: {response.status_code}, message: {error_message}")
44-
return {}
45-
46-
47-
def associate(self, org_slug: str, label_id: int, repo_id: str) -> dict:
48-
path = f"orgs/{org_slug}/repos/labels/{label_id}/associate"
49-
payload = json.dumps({"repository_id": repo_id})
50-
response = self.api.do_request(path=path, method="POST", payload=payload)
51-
if response.status_code == 200:
52-
return response.json()
53-
54-
error_message = response.json().get("error", {}).get("message", "Unknown error")
55-
log.error(f"Error associating repository label: {response.status_code}, message: {error_message}")
56-
return {}
57-
58-
def disassociate(self, org_slug: str, label_id: int, repo_id: str) -> dict:
59-
path = f"orgs/{org_slug}/repos/labels/{label_id}/disassociate"
60-
payload = json.dumps({"repository_id": repo_id})
61-
response = self.api.do_request(path=path, method="POST", payload=payload)
62-
if response.status_code == 200:
63-
return response.json()
64-
65-
error_message = response.json().get("error", {}).get("message", "Unknown error")
66-
log.error(f"Error associating repository label: {response.status_code}, message: {error_message}")
67-
return {}

‎socketdev/npm/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def issues(self, package: str, version: str) -> list:
1515
if response.status_code == 200:
1616
return response.json()
1717
log.error(f"Error getting npm issues: {response.status_code}")
18-
print(response.text)
18+
log.error(response.text)
1919
return []
2020

2121
def score(self, package: str, version: str) -> list:
@@ -24,5 +24,5 @@ def score(self, package: str, version: str) -> list:
2424
if response.status_code == 200:
2525
return response.json()
2626
log.error(f"Error getting npm score: {response.status_code}")
27-
print(response.text)
27+
log.error(response.text)
2828
return []

‎socketdev/openapi/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ def get(self) -> dict:
1515
if response.status_code == 200:
1616
return response.json()
1717
log.error(f"Error getting OpenAPI spec: {response.status_code}")
18-
print(response.text)
18+
log.error(response.text)
1919
return {}

‎socketdev/org/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ def get(self, use_types: bool = False) -> OrganizationsResponse:
3030
return OrganizationsResponse(result)
3131
return result
3232
log.error(f"Error getting organizations: {response.status_code}")
33-
print(response.text)
33+
log.error(response.text)
3434
return {"organizations": {}}

‎socketdev/purl/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ def post(self, license: str = "false", components: list = None, **kwargs) -> lis
3737
return purl_deduped
3838

3939
log.error(f"Error posting {components} to the Purl API: {response.status_code}")
40-
print(response.text)
40+
log.error(response.text)
4141
return []

‎socketdev/quota/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ def get(self) -> dict:
1515
if response.status_code == 200:
1616
return response.json()
1717
log.error(f"Error getting quota: {response.status_code}")
18-
print(response.text)
18+
log.error(response.text)
1919
return {}

‎socketdev/report/__init__.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def list(self, from_time: int = None) -> dict:
2727
if response.status_code == 200:
2828
return response.json()
2929
log.error(f"Error listing reports: {response.status_code}")
30-
print(response.text)
30+
log.error(response.text)
3131
return {}
3232

3333
def delete(self, report_id: str) -> bool:
@@ -36,7 +36,7 @@ def delete(self, report_id: str) -> bool:
3636
if response.status_code == 200:
3737
return True
3838
log.error(f"Error deleting report: {response.status_code}")
39-
print(response.text)
39+
log.error(response.text)
4040
return False
4141

4242
def view(self, report_id) -> dict:
@@ -45,7 +45,7 @@ def view(self, report_id) -> dict:
4545
if response.status_code == 200:
4646
return response.json()
4747
log.error(f"Error viewing report: {response.status_code}")
48-
print(response.text)
48+
log.error(response.text)
4949
return {}
5050

5151
def supported(self) -> dict:
@@ -54,7 +54,7 @@ def supported(self) -> dict:
5454
if response.status_code == 200:
5555
return response.json()
5656
log.error(f"Error getting supported reports: {response.status_code}")
57-
print(response.text)
57+
log.error(response.text)
5858
return {}
5959

6060
def create(self, files: list) -> dict:
@@ -68,5 +68,5 @@ def create(self, files: list) -> dict:
6868
if response.status_code == 200:
6969
return response.json()
7070
log.error(f"Error creating report: {response.status_code}")
71-
print(response.text)
71+
log.error(response.text)
7272
return {}

0 commit comments

Comments
 (0)