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

Refactor file download

Browse Source
This commit is contained in:
Sven Merk 2019-03-29 14:22:42 +01:00
parent c82bcc9c86
commit d169bfb619
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,8 @@ class WhitesourceRepository implements Serializable {
productToken: config.whitesource.productToken
]
fetchFileFromWhiteSource(reportName, requestContent)
//fetchFileFromWhiteSource(reportName, requestContent)
httpWhitesource(requestContent, 'APPLICATION_PDF', reportName)
}
def fetchProductLicenseAlerts() {
@ -166,19 +167,22 @@ class WhitesourceRepository implements Serializable {
}
@NonCPS
protected def httpWhitesource(requestBody) {
protected def httpWhitesource(requestBody, acceptType = 'APPLICATION_JSON', outputFile = null) {
handleAdditionalRequestParameters(requestBody)
def serializedBody = new JsonUtils().groovyObjectToPrettyJsonString(requestBody)
def params = [
url : config.whitesource.serviceUrl,
httpMode : 'POST',
acceptType : 'APPLICATION_JSON',
acceptType : acceptType,
contentType: 'APPLICATION_JSON',
requestBody: serializedBody,
quiet : !config.verbose,
timeout : config.whitesource.timeout
]
if (outputFile)
params["outputFile"] = outputFile
if (script.env.HTTP_PROXY)
params["httpProxy"] = script.env.HTTP_PROXY

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

@ -329,7 +329,6 @@ class WhitesourceRepositoryTest extends BasePiperTest {
exception.expectMessage("[WhiteSource] Request failed with error message 'User is not allowed to perform this action' (5001)")
helper.registerAllowedMethod('httpRequest', [Map], { p ->
requestParams = p
return [content: responseBody]
})
@ -339,22 +338,31 @@ class WhitesourceRepositoryTest extends BasePiperTest {
@Test
void testFetchReportForProduct() {
repository.config.putAll([whitesource: [serviceUrl: "http://mo-323123123.sap.corp/some", productToken: "4711"], verbose: true])
def command
helper.registerAllowedMethod('sh', [String], { cmd ->
command = cmd
repository.config.putAll([whitesource: [serviceUrl: "http://mo-323123123.sap.corp/some", productToken: "4712", userKey: "4711"], verbose: true])
def requestBody = "{ \"requestType\": \"getProductRiskReport\", \"productToken\": \"${repository.config.whitesource.productToken}\" }"
def requestParams
helper.registerAllowedMethod('httpRequest', [Map], { p ->
requestParams = p
})
repository.fetchReportForProduct("test.file")
assertThat(command, equals('''#!/bin/sh -e
curl -o test.file -X POST http://some.host.whitesource.com/api/ -H 'Content-Type: application/json' -d '{
"requestType": "getProductRiskReport",
"productToken": "4711"
}'''
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"
]
))
assertThat(jlr.log, containsString("Sending curl request with parameters [requestType:getProductRiskReport, productToken:4711]"))
assertThat(jlr.log, containsString("Sending http request with parameters [requestType:getProductRiskReport, productToken:4711]"))
}
@Test