foomo/posh-providers
1
0
Fork 0
mirror of https://github.com/foomo/posh-providers.git synced 2025-10-16 12:35:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #192 from foomo/fix/slack-notification-log

Browse Source 
fix(foomo/squadron): slack notification log
This commit is contained in:
Kevin Franklin Kim 2025-03-21 15:59:37 +01:00 committed by GitHub
commit 56d133b200
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
foomo/squadron/v2/command.go
View File

@ -486,8 +486,6 @@ func (c *Command) execute(ctx context.Context, r *readline.Readline) error {
if ok, _ := ifs.GetBool("slack"); cfgCluster.Notify || ok {
if err := c.notify(ctx, cmd, cluster, fleet, squadron, tag, tags, units); err != nil {
c.l.Warn("failed to send notification:", err.Error())
} else {
c.l.Info("💬 sent slack notification")
}
}
}

30
slack-go/slack/slack.go
View File

@ -132,10 +132,16 @@ func (s *Slack) SendETCDUpdateMessage(ctx context.Context, cluster string) error
)
fallbackOpt := slack.MsgOptionText(fmt.Sprintf("ETCD config update on %s", cluster), false)
return s.Send(ctx,
if err := s.Send(ctx,
s.cfg.Channels["releases"],
slack.MsgOptionCompose(fallbackOpt, blockOpt),
)
); err != nil {
return err
}
s.l.Info("💌 sent slack notification")
return nil
}
func (s *Slack) Send(ctx context.Context, channel string, opts ...slack.MsgOption) error {
@ -145,8 +151,13 @@ func (s *Slack) Send(ctx context.Context, channel string, opts ...slack.MsgOptio
if err != nil {
return err
}
_, _, _, err = client.SendMessageContext(ctx, channel, opts...)
return err
if _, _, _, err = client.SendMessageContext(ctx, channel, opts...); err != nil {
return err
}
s.l.Info("💌 sent slack notification")
return nil
}
func (s *Slack) SendWebhook(ctx context.Context, webhook string, blocks []slack.Block) error {
@ -156,11 +167,18 @@ func (s *Slack) SendWebhook(ctx context.Context, webhook string, blocks []slack.
}
ctx, cancel := context.WithTimeout(ctx, time.Second)
defer cancel()
return slack.PostWebhookContext(ctx, url, &slack.WebhookMessage{
if err := slack.PostWebhookContext(ctx, url, &slack.WebhookMessage{
Blocks: &slack.Blocks{
BlockSet: blocks,
},
})
}); err != nil {
return err
}
s.l.Info("💌 sent slack notification")
return nil
}
func (s *Slack) MarkdownSection(text string) *slack.SectionBlock {