Skip to content

Commit

Permalink
Merge pull request #603 from GJKrupa/main
Browse files Browse the repository at this point in the history
Remove checks for empty user and channel parameters in Rocket notifier
  • Loading branch information
stefanprodan authored Aug 23, 2023
2 parents 3a34275 + f8cba73 commit d353de4
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 9 deletions.
9 changes: 0 additions & 9 deletions internal/notifier/rocket.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package notifier
import (
"context"
"crypto/x509"
"errors"
"fmt"
"net/url"
"strings"
Expand All @@ -43,14 +42,6 @@ func NewRocket(hookURL string, proxyURL string, certPool *x509.CertPool, usernam
return nil, fmt.Errorf("invalid Rocket hook URL %s: '%w'", hookURL, err)
}

if username == "" {
return nil, errors.New("empty Rocket username")
}

if channel == "" {
return nil, errors.New("empty Rocket channel")
}

return &Rocket{
Channel: channel,
URL: hookURL,
Expand Down
20 changes: 20 additions & 0 deletions internal/notifier/rocket_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,23 @@ func TestRocket_Post(t *testing.T) {
err = rocket.Post(context.TODO(), testEvent())
require.NoError(t, err)
}

func TestRocket_PostWithoutChannelOrUser(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
b, err := io.ReadAll(r.Body)
require.NoError(t, err)

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

rocket, err := NewRocket(ts.URL, "", nil, "", "")
require.NoError(t, err)

err = rocket.Post(context.TODO(), testEvent())
require.NoError(t, err)
}

0 comments on commit d353de4

Please sign in to comment.