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

remove Pipeline word in subject (#3874)

Browse Source
This commit is contained in:
Oliver Feldmann 2022-07-05 11:55:07 +03:00 committed by GitHub
parent 6cf4e98b12
commit ebedf412e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/log/ansHook.go
View File

@ -52,7 +52,7 @@ func (ansHook *ANSHook) Fire(entry *logrus.Entry) (err error) {
event.EventTimestamp = entry.Time.Unix()
if event.Subject == "" {
event.Subject = fmt.Sprintf("Pipeline step '%s' sends '%s'", stepName, event.Severity)
event.Subject = fmt.Sprintf("Step '%s' sends '%s'", stepName, event.Severity)
}
event.Body = entry.Message
event.Tags["cicd:logLevel"] = logLevel.String()

4
pkg/log/ansHook_test.go
View File

@ -181,7 +181,7 @@ func TestANSHook_Fire(t *testing.T) {
logrusEntryWithoutStepName.Data = map[string]interface{}{}
require.NoError(t, ansHook.Fire(logrusEntryWithoutStepName), "error is not nil")
assert.Equal(t, "n/a", registrationUtil.Event.Tags["cicd:stepName"], "event step name tag is not as expected.")
assert.Equal(t, "Pipeline step 'n/a' sends 'WARNING'", registrationUtil.Event.Subject, "event subject is not as expected")
assert.Equal(t, "Step 'n/a' sends 'WARNING'", registrationUtil.Event.Subject, "event subject is not as expected")
registrationUtil.clearEventTemplate()
})
}
@ -399,7 +399,7 @@ func defaultResultingEvent() ans.Event {
"EventTimestamp": defaultTime.Unix(),
"Severity": "WARNING",
"Category": "ALERT",
"Subject": "Pipeline step 'testStep' sends 'WARNING'",
"Subject": "Step 'testStep' sends 'WARNING'",
"Body": "my log message",
"Tags": map[string]interface{}{
"ans:correlationId": "1234",