Skip to content

Commit 3a3c55d

Browse files
tjarrettveracodetjarrettveracode
committed
bugfix release
1 parent 52b01a6 commit 3a3c55d

File tree

2 files changed

+57
-57
lines changed

2 files changed

+57
-57
lines changed

‎setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
setup(
44
name = 'veracode_api_py',
55
packages = ['veracode_api_py'],
6-
version = '0.6',
6+
version = '0.7',
77
license='MIT',
88
description = 'Python helper library for working with the Veracode APIs. Handles retries, pagination, and other features of the modern Veracode REST APIs.',
99
author = 'Tim Jarrett',
1010
author_email = 'tjarrett@veracode.com',
1111
url = 'https://github.com/tjarrettveracode',
12-
download_url = 'https://github.com/tjarrettveracode/veracode-api-py/archive/v_06.tar.gz',
12+
download_url = 'https://github.com/tjarrettveracode/veracode-api-py/archive/v_07.tar.gz',
1313
keywords = ['veracode', 'veracode-api'],
1414
install_requires=[
1515
'veracode-api-signing'

‎veracode_api_py/api.py‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -63,64 +63,64 @@ def _request(self, url, method, params=None):
6363
logging.exception("Connection error")
6464
raise VeracodeAPIError(e)
6565

66-
def _rest_request(self, url, method, params=None,body=None,fullresponse=False):
67-
# base request method for a REST request
68-
myheaders = {"User-Agent": "api.py"}
69-
if method in ["POST", "PUT"]:
70-
myheaders.update({'Content-type': 'application/json'})
71-
72-
if method == "GET":
73-
# incorporate retries to deal with some failure situations
74-
try:
75-
session = requests.Session()
76-
session.mount(self.base_rest_url, HTTPAdapter(max_retries=3))
77-
request = requests.Request(method, self.base_rest_url + url, params=params, auth=RequestsAuthPluginVeracodeHMAC(), headers=myheaders)
78-
prepared_request = request.prepare()
79-
r = session.send(prepared_request, proxies=self.proxies)
80-
if r.status_code == 500 or r.status_code == 504:
81-
time.sleep(1)
82-
r = requests.Request(method, url, params=params, auth=RequestsAuthPluginVeracodeHMAC(),headers=myheaders,json=body)
83-
except requests.exceptions.RequestException as e:
84-
logging.exception("Connection error")
85-
raise VeracodeAPIError(e)
86-
elif method == "POST":
87-
try:
88-
r = requests.post(self.base_rest_url + url,params=params,auth=RequestsAuthPluginVeracodeHMAC(),headers=myheaders,data=body)
89-
except requests.exceptions.RequestException as e:
90-
logging.exception("Connection error")
91-
raise VeracodeAPIError(e)
92-
elif method == "PUT":
93-
try:
94-
r = requests.put(self.base_rest_url + url,params=params,auth=RequestsAuthPluginVeracodeHMAC(), headers=myheaders,data=body)
95-
except requests.exceptions.RequestException as e:
96-
logging.exception("Connection error")
97-
raise VeracodeAPIError(e)
98-
elif method == "DELETE":
99-
try:
100-
r = requests.delete(self.base_rest_url + url,params=params,auth=RequestsAuthPluginVeracodeHMAC(),headers=myheaders)
101-
except requests.exceptions.RequestException as e:
102-
logging.exception("Connection error")
103-
raise VeracodeAPIError(e)
104-
else:
105-
raise VeracodeAPIError("Unsupported HTTP method")
66+
def _rest_request(self, url, method, params=None,body=None,fullresponse=False):
67+
# base request method for a REST request
68+
myheaders = {"User-Agent": "api.py"}
69+
if method in ["POST", "PUT"]:
70+
myheaders.update({'Content-type': 'application/json'})
71+
72+
if method == "GET":
73+
# incorporate retries to deal with some failure situations
74+
try:
75+
session = requests.Session()
76+
session.mount(self.base_rest_url, HTTPAdapter(max_retries=3))
77+
request = requests.Request(method, self.base_rest_url + url, params=params, auth=RequestsAuthPluginVeracodeHMAC(), headers=myheaders)
78+
prepared_request = request.prepare()
79+
r = session.send(prepared_request, proxies=self.proxies)
80+
if r.status_code == 500 or r.status_code == 504:
81+
time.sleep(1)
82+
r = requests.Request(method, url, params=params, auth=RequestsAuthPluginVeracodeHMAC(),headers=myheaders,json=body)
83+
except requests.exceptions.RequestException as e:
84+
logging.exception("Connection error")
85+
raise VeracodeAPIError(e)
86+
elif method == "POST":
87+
try:
88+
r = requests.post(self.base_rest_url + url,params=params,auth=RequestsAuthPluginVeracodeHMAC(),headers=myheaders,data=body)
89+
except requests.exceptions.RequestException as e:
90+
logging.exception("Connection error")
91+
raise VeracodeAPIError(e)
92+
elif method == "PUT":
93+
try:
94+
r = requests.put(self.base_rest_url + url,params=params,auth=RequestsAuthPluginVeracodeHMAC(), headers=myheaders,data=body)
95+
except requests.exceptions.RequestException as e:
96+
logging.exception("Connection error")
97+
raise VeracodeAPIError(e)
98+
elif method == "DELETE":
99+
try:
100+
r = requests.delete(self.base_rest_url + url,params=params,auth=RequestsAuthPluginVeracodeHMAC(),headers=myheaders)
101+
except requests.exceptions.RequestException as e:
102+
logging.exception("Connection error")
103+
raise VeracodeAPIError(e)
104+
else:
105+
raise VeracodeAPIError("Unsupported HTTP method")
106106

107-
if not (r.status_code == requests.codes.ok):
108-
logging.debug("API call returned non-200 HTTP status code: {}".format(r.status_code))
107+
if not (r.status_code == requests.codes.ok):
108+
logging.debug("API call returned non-200 HTTP status code: {}".format(r.status_code))
109109

110-
if not (r.ok):
111-
logging.debug("Error retrieving data. HTTP status code: {}".format(r.status_code))
112-
if r.status_code == 401:
113-
logging.exception("Check that your Veracode API account credentials are correct.")
114-
else:
115-
logging.exception("Error [{}]: {} for request {}".format(r.status_code,r.text, r.request.url))
116-
raise requests.exceptions.RequestException()
117-
elif fullresponse:
118-
return r
119-
else:
120-
if r.text != "":
121-
return r.json()
110+
if not (r.ok):
111+
logging.debug("Error retrieving data. HTTP status code: {}".format(r.status_code))
112+
if r.status_code == 401:
113+
logging.exception("Check that your Veracode API account credentials are correct.")
114+
else:
115+
logging.exception("Error [{}]: {} for request {}".format(r.status_code,r.text, r.request.url))
116+
raise requests.exceptions.RequestException()
117+
elif fullresponse:
118+
return r
122119
else:
123-
return ""
120+
if r.text != "":
121+
return r.json()
122+
else:
123+
return ""
124124

125125
def _rest_paged_request(self, url, method, element, params=None):
126126
all_data = []

0 commit comments

Comments
 (0)