jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2024-12-12 10:55:20 +02:00
Code Issues Releases Activity

toolrecord: fix web ui URLs for whitesource, close #6 (#3096)

Browse Source
This commit is contained in:
larsbrueckner 2021-09-10 13:20:54 +02:00 committed by GitHub
parent 45cb97c8d9
commit ab396ce6f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/whitesourceExecuteScan.go
View File

@ -928,7 +928,8 @@ func persistScannedProjects(config *ScanOptions, scan *ws.Scan, commonPipelineEn
//
func createToolRecordWhitesource(workspace string, config *whitesourceExecuteScanOptions, scan *ws.Scan) (string, error) {
record := toolrecord.New(workspace, "whitesource", config.ServiceURL)
productURL := config.ServiceURL + "/Wss/WSS.html#!product;token=" + config.ProductToken
wsUiRoot := "https://saas.whitesourcesoftware.com"
productURL := wsUiRoot + "/Wss/WSS.html#!product;token=" + config.ProductToken
err := record.AddKeyData("product",
config.ProductToken,
config.ProductName,
@ -943,7 +944,7 @@ func createToolRecordWhitesource(workspace string, config *whitesourceExecuteSca
token := project.Token
projectURL := ""
if token != "" {
projectURL = config.ServiceURL + "/Wss/WSS.html#!project;token=" + token
projectURL = wsUiRoot + "/Wss/WSS.html#!project;token=" + token
} else {
// token is empty, provide a dummy to have an indication
token = "unknown"

39
pkg/toolrecord/toolrecord_main.go
View File

@ -112,7 +112,30 @@ func (tr *Toolrecord) Persist() error {
if err != nil {
return fmt.Errorf("TR_PERSIST: %v", err)
}
// convenience aggregation
// set default display data if required
if tr.DisplayName == "" {
tr.GenerateDefaultDisplayData()
}
file, err := json.Marshal(tr)
if err != nil {
return fmt.Errorf("TR_PERSIST: %v", err)
}
// no json generated ?
if len(file) == 0 {
return fmt.Errorf("TR_PERSIST: empty json content")
}
err = ioutil.WriteFile(tr.GetFileName(), file, 0644)
if err != nil {
return fmt.Errorf("TR_PERSIST: %v", err)
}
return nil
}
// default aggregation for overall displayName and URL
// can be overriden by calling SetOverallDisplayData
func (tr *Toolrecord) GenerateDefaultDisplayData() {
displayName := ""
displayURL := ""
for _, keyset := range tr.Keys {
@ -131,20 +154,6 @@ func (tr *Toolrecord) Persist() error {
}
tr.DisplayName = displayName
tr.DisplayURL = displayURL
file, err := json.Marshal(tr)
if err != nil {
return fmt.Errorf("TR_PERSIST: %v", err)
}
// no json generated ?
if len(file) == 0 {
return fmt.Errorf("TR_PERSIST: empty json content")
}
err = ioutil.WriteFile(tr.GetFileName(), file, 0644)
if err != nil {
return fmt.Errorf("TR_PERSIST: %v", err)
}
return nil
}
// Override the default generation for DisplayName & DisplayURL