fluxcd
/
notification-controller
mirror of https://github.com/fluxcd/notification-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #124 from SomtochiAma/object-kind-messages 

Add object kind to messages
This commit is contained in:
Stefan Prodan 2021-01-20 17:08:05 +02:00 committed by GitHub
parent 355ec9353c 46576679b1
commit 9d4ef07fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/notifier/discord.go
View File

@ -91,7 +91,7 @@ func (s *Discord) Post(event recorder.Event) error {
a := SlackAttachment{ a := SlackAttachment{
Color: color, Color: color,
AuthorName: fmt.Sprintf("%s.%s", event.InvolvedObject.Name, event.InvolvedObject.Namespace), AuthorName: fmt.Sprintf("%s/%s.%s", strings.ToLower(event.InvolvedObject.Kind), event.InvolvedObject.Name, event.InvolvedObject.Namespace),
Text: event.Message, Text: event.Message,
MrkdwnIn: []string{"text"}, MrkdwnIn: []string{"text"},
Fields: sfields, Fields: sfields,

2
internal/notifier/discord_test.go
View File

@ -36,7 +36,7 @@ func TestDiscord_Post(t *testing.T) {
var payload = SlackPayload{} var payload = SlackPayload{}
err = json.Unmarshal(b, &payload) err = json.Unmarshal(b, &payload)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, "webapp.gitops-system", payload.Attachments[0].AuthorName) require.Equal(t, "gitrepository/webapp.gitops-system", payload.Attachments[0].AuthorName)
require.Equal(t, "metadata", payload.Attachments[0].Fields[0].Value) require.Equal(t, "metadata", payload.Attachments[0].Fields[0].Value)
})) }))
defer ts.Close() defer ts.Close()

3
internal/notifier/rocket.go
View File

@ -20,6 +20,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"net/url" "net/url"
"strings"
"github.com/fluxcd/pkg/recorder" "github.com/fluxcd/pkg/recorder"
) )
@ -79,7 +80,7 @@ func (s *Rocket) Post(event recorder.Event) error {
a := SlackAttachment{ a := SlackAttachment{
Color: color, Color: color,
AuthorName: fmt.Sprintf("%s.%s", event.InvolvedObject.Name, event.InvolvedObject.Namespace), AuthorName: fmt.Sprintf("%s/%s.%s", strings.ToLower(event.InvolvedObject.Kind), event.InvolvedObject.Name, event.InvolvedObject.Namespace),
Text: event.Message, Text: event.Message,
MrkdwnIn: []string{"text"}, MrkdwnIn: []string{"text"},
Fields: sfields, Fields: sfields,

2
internal/notifier/rocket_test.go
View File

@ -34,7 +34,7 @@ func TestRocket_Post(t *testing.T) {
var payload = SlackPayload{} var payload = SlackPayload{}
err = json.Unmarshal(b, &payload) err = json.Unmarshal(b, &payload)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, "webapp.gitops-system", payload.Attachments[0].AuthorName) require.Equal(t, "gitrepository/webapp.gitops-system", payload.Attachments[0].AuthorName)
require.Equal(t, "metadata", payload.Attachments[0].Fields[0].Value) require.Equal(t, "metadata", payload.Attachments[0].Fields[0].Value)
})) }))
defer ts.Close() defer ts.Close()

3
internal/notifier/slack.go
View File

@ -20,6 +20,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"net/url" "net/url"
"strings"
"github.com/fluxcd/pkg/recorder" "github.com/fluxcd/pkg/recorder"
) )
@ -103,7 +104,7 @@ func (s *Slack) Post(event recorder.Event) error {
a := SlackAttachment{ a := SlackAttachment{
Color: color, Color: color,
AuthorName: fmt.Sprintf("%s.%s", event.InvolvedObject.Name, event.InvolvedObject.Namespace), AuthorName: fmt.Sprintf("%s/%s.%s", strings.ToLower(event.InvolvedObject.Kind), event.InvolvedObject.Name, event.InvolvedObject.Namespace),
Text: event.Message, Text: event.Message,
MrkdwnIn: []string{"text"}, MrkdwnIn: []string{"text"},
Fields: sfields, Fields: sfields,

2
internal/notifier/slack_test.go
View File

@ -34,7 +34,7 @@ func TestSlack_Post(t *testing.T) {
var payload = SlackPayload{} var payload = SlackPayload{}
err = json.Unmarshal(b, &payload) err = json.Unmarshal(b, &payload)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, "webapp.gitops-system", payload.Attachments[0].AuthorName) require.Equal(t, "gitrepository/webapp.gitops-system", payload.Attachments[0].AuthorName)
require.Equal(t, "metadata", payload.Attachments[0].Fields[0].Value) require.Equal(t, "metadata", payload.Attachments[0].Fields[0].Value)
})) }))
defer ts.Close() defer ts.Close()

3
internal/notifier/teams.go
View File

@ -19,6 +19,7 @@ package notifier
import ( import (
"fmt" "fmt"
"net/url" "net/url"
"strings"
"github.com/fluxcd/pkg/recorder" "github.com/fluxcd/pkg/recorder"
) )
@ -78,7 +79,7 @@ func (s *MSTeams) Post(event recorder.Event) error {
}) })
} }
objName := fmt.Sprintf("%s.%s", event.InvolvedObject.Name, event.InvolvedObject.Namespace) objName := fmt.Sprintf("%s/%s.%s", strings.ToLower(event.InvolvedObject.Kind), event.InvolvedObject.Name, event.InvolvedObject.Namespace)
payload := MSTeamsPayload{ payload := MSTeamsPayload{
Type: "MessageCard", Type: "MessageCard",
Context: "http://schema.org/extensions", Context: "http://schema.org/extensions",

2
internal/notifier/teams_test.go
View File

@ -34,7 +34,7 @@ func TestTeams_Post(t *testing.T) {
err = json.Unmarshal(b, &payload) err = json.Unmarshal(b, &payload)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, "webapp.gitops-system", payload.Sections[0].ActivitySubtitle) require.Equal(t, "gitrepository/webapp.gitops-system", payload.Sections[0].ActivitySubtitle)
require.Equal(t, "metadata", payload.Sections[0].Facts[0].Value) require.Equal(t, "metadata", payload.Sections[0].Facts[0].Value)
})) }))
defer ts.Close() defer ts.Close()