add extra error field

Author: afzal442

pkg/services/slack.go

@@ -178,8 +178,10 @@ func (s *slackService) Send(notification Notification, dest Destination) error {
 	if err != nil {
 		return err
 	}
+	client, err := newSlackClient(s.opts)
 	return slackutil.NewThreadedClient(
-		newSlackClient(s.opts, err),
+		client,
+		err,
 		slackState,
 	).SendMessage(
 		context.TODO(),
@@ -196,7 +198,7 @@ func (s *slackService) GetSigningSecret() string {
 	return s.opts.SigningSecret
 }
 
-func newSlackClient(opts SlackOptions, err error) *slack.Client {
+func newSlackClient(opts SlackOptions) (slackclient *slack.Client, err error) {
 	apiURL := slack.APIURL
 	if opts.ApiURL != "" {
 		apiURL = opts.ApiURL
@@ -209,7 +211,7 @@ func newSlackClient(opts SlackOptions, err error) *slack.Client {
 	client := &http.Client{
 		Transport: httputil.NewLoggingRoundTripper(transport, log.WithField("service", "slack")),
 	}
-	return slack.New(opts.Token, slack.OptionHTTPClient(client), slack.OptionAPIURL(apiURL))
+	return slack.New(opts.Token, slack.OptionHTTPClient(client), slack.OptionAPIURL(apiURL)), err
 }
 
 func isValidIconURL(iconURL string) bool {

pkg/util/slack/client.go

@@ -80,11 +80,12 @@ func NewState(limiter *rate.Limiter) *state {
 
 type threadedClient struct {
 	Client SlackClient
+	error
 	*state
 }
 
-func NewThreadedClient(client SlackClient, s *state) *threadedClient {
-	return &threadedClient{client, s}
+func NewThreadedClient(client SlackClient, err error, s *state) *threadedClient {
+	return &threadedClient{client, err, s}
 }
 
 func (c *threadedClient) getChannelID(recipient string) string {

pkg/util/slack/client_test.go

@@ -174,6 +174,7 @@ func TestThreadedClient(t *testing.T) {
 
 			client := NewThreadedClient(
 				m,
+				slack.ErrExpiredTimestamp,
 				&state{
 					Limiter:    rate.NewLimiter(rate.Inf, 1),
 					ThreadTSs:  tc.threadTSs,