Skip to content

Commit 4b9cea9

Browse files
cp2bostonLi Xu
authored andcommitted
RCB-536 Fixed InsecureRequestWarning (#73)
* Fixed InsecureRequestWarning - merge_environment_settings, verify needs to be True or None * Fixed Jenkinsfile.examples - build Dockerfile --no-cache * Forgot .
1 parent 163ff74 commit 4b9cea9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Jenkinsfile.examples

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ node {
1111
}
1212
stage("Build Dockerfile") {
1313
dir ("${DOCKERFILE_DIR}") {
14-
docker.build("${TEST_CONTAINER}")
14+
sh "docker build --no-cache -t ${TEST_CONTAINER} ."
1515
}
1616
}
1717
stage("Run Examples") {

rosette/api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ def call(self, parameters):
525525
request = requests.Request(
526526
'POST', url, files=files, headers=headers, params=payload)
527527
prepared_request = self.api.session.prepare_request(request)
528-
settings = self.api.session.merge_environment_settings(prepared_request.url, {}, {}, {}, {})
528+
settings = self.api.session.merge_environment_settings(prepared_request.url, {}, {}, None, {})
529529
response = self.api.session.send(prepared_request, **settings)
530530
rdata = response.content
531531
response_headers = {"responseHeaders": dict(response.headers)}
@@ -646,7 +646,7 @@ def _make_request(self, operation, url, data, headers):
646646
operation, url, data=data, headers=headers, params=payload)
647647
prepared_request = self.session.prepare_request(request)
648648
# Take into account environment settings, e.g. HTTP_PROXY and HTTPS_PROXY
649-
settings = self.session.merge_environment_settings(prepared_request.url, {}, {}, {}, {})
649+
settings = self.session.merge_environment_settings(prepared_request.url, {}, {}, None, {})
650650

651651
try:
652652
response = self.session.send(prepared_request, **settings)

0 commit comments

Comments
 (0)