jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-03-05 15:15:44 +02:00
Code Issues Releases Activity

Remove obsolete code, avoid caching of request

Browse Source
This commit is contained in:
Sven Merk 2019-03-29 14:38:43 +01:00
parent 8698795ba6
commit 55e3622e6b
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/sap/piper/integration/WhitesourceRepository.groovy
View File

@ -135,13 +135,14 @@ class WhitesourceRepository implements Serializable {
}
void fetchReportForProduct(reportName) {
def headers = [[name: 'Cache-Control', value: 'no-cache, no-store, must-revalidate'], [name: 'Pragma', value: 'no-cache']]
def requestContent = [
requestType: "getProductRiskReport",
productToken: config.whitesource.productToken
]
//fetchFileFromWhiteSource(reportName, requestContent)
httpWhitesource(requestContent, 'APPLICATION_PDF', reportName)
httpWhitesource(requestContent, 'APPLICATION_PDF', headers, reportName)
}
def fetchProductLicenseAlerts() {
@ -167,7 +168,7 @@ class WhitesourceRepository implements Serializable {
}
@NonCPS
protected def httpWhitesource(requestBody, acceptType = 'APPLICATION_JSON', outputFile = null) {
protected def httpWhitesource(requestBody, acceptType = 'APPLICATION_JSON', customHeaders = null, outputFile = null) {
handleAdditionalRequestParameters(requestBody)
def serializedBody = new JsonUtils().groovyObjectToPrettyJsonString(requestBody)
def params = [
@ -180,11 +181,11 @@ class WhitesourceRepository implements Serializable {
timeout : config.whitesource.timeout
]
if (outputFile)
params["outputFile"] = outputFile
if(customHeaders) params["customHeaders"] = customHeaders
if (script.env.HTTP_PROXY)
params["httpProxy"] = script.env.HTTP_PROXY
if (outputFile) params["outputFile"] = outputFile
if (script.env.HTTP_PROXY) params["httpProxy"] = script.env.HTTP_PROXY
if(config.verbose)
script.echo "Sending http request with parameters ${params}"
@ -197,17 +198,6 @@ class WhitesourceRepository implements Serializable {
return response
}
@NonCPS
protected void fetchFileFromWhiteSource(String fileName, Map params) {
handleAdditionalRequestParameters(params)
def serializedContent = new JsonUtils().groovyObjectToPrettyJsonString(params)
if(config.verbose)
script.echo "Sending curl request with parameters ${params}"
script.sh "${config.verbose ? '' : '#!/bin/sh -e\n'}curl --fail -o ${fileName} -X POST ${config.whitesource.serviceUrl} -H 'Content-Type: application/json' -d \'${serializedContent}\'"
}
@NonCPS
protected void handleAdditionalRequestParameters(params) {
if(config.whitesource.userKey)

19
test/groovy/com/sap/piper/integration/WhitesourceRepositoryTest.groovy
View File

@ -350,15 +350,16 @@ class WhitesourceRepositoryTest extends BasePiperTest {
assertThat(requestParams, is(
[
url : repository.config.whitesource.serviceUrl,
httpMode : 'POST',
acceptType : 'APPLICATION_PDF',
contentType: 'APPLICATION_JSON',
requestBody: requestBody,
quiet : false,
userKey : repository.config.whitesource.userKey,
httpProxy : "http://test.sap.com:8080",
outputFile : "test.file"
url : repository.config.whitesource.serviceUrl,
httpMode : 'POST',
acceptType : 'APPLICATION_PDF',
contentType : 'APPLICATION_JSON',
requestBody : requestBody,
quiet : false,
userKey : repository.config.whitesource.userKey,
httpProxy : "http://test.sap.com:8080",
outputFile : "test.file",
customHeaders : [[name: 'Cache-Control', value: 'no-cache, no-store, must-revalidate'], [name: 'Pragma', value: 'no-cache']]
]
))