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

Add error handling to org admin

Browse Source
This commit is contained in:
Sven Merk 2019-03-12 11:04:03 +01:00
parent 28418eae7c
commit d1a25f6ae5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/sap/piper/integration/WhitesourceOrgAdminRepository.groovy
View File

@ -25,8 +25,7 @@ class WhitesourceOrgAdminRepository implements Serializable {
requestType: "getOrganizationProductVitals",
orgToken: config.orgToken
]
def response = internalWhitesource ? internalWhitesource.httpWhitesource(requestBody) : httpWhitesource(requestBody)
def parsedResponse = new JsonUtils().parseJsonSerializable(response.content)
def parsedResponse = issueHttpRequest(requestBody)
findProductMeta(parsedResponse)
}
@ -49,8 +48,7 @@ class WhitesourceOrgAdminRepository implements Serializable {
orgToken: config.orgToken,
productName: config.productName
]
def response = issueHttpRequest(requestBody)
def parsedResponse = new JsonUtils().parseJsonSerializable(response.content)
def parsedResponse = issueHttpRequest(requestBody)
def metaInfo = parsedResponse
def groups = []
@ -72,7 +70,12 @@ class WhitesourceOrgAdminRepository implements Serializable {
}
def issueHttpRequest(requestBody) {
internalWhitesource ? internalWhitesource.httpWhitesource(requestBody) : httpWhitesource(requestBody)
def response = internalWhitesource ? internalWhitesource.httpWhitesource(requestBody) : httpWhitesource(requestBody)
def parsedResponse = new JsonUtils().parseJsonSerializable(response.content)
if(parsedResponse?.errorCode){
script.error "[WhiteSource] Request failed with error message '${parsedResponse.errorMessage}' (${parsedResponse.errorCode})."
}
return parsedResponse
}
@NonCPS