added notification support for discord #157

wryonik · 2019-06-09T00:11:25Z

Added Disocrd notification support using Slack-Compatible Webhook.
#144

fristonio

This is not how I would like to see this implemented. Like I told you on the slack, implement this using an interface. Create a general interface for notifier

type Notifer interface {
    SendNotification(message) error
}

Create a struct for each provider for the notification like discord, slack and irc and implement this interface for these providers.

type SlackNotificationProvider struct  {
    WebHookUrl string
}

func NewNotifier(providerType ProviderType) Notifier {
   if providerType == ProviderType.Slack
       return SlackNotificationProvider{
           WebHookUrl: "URL"
       }
   retun nil
}

func (p *SlackNotificationProvider) SendNotification(messag string) error {
   // code to send notification
    return nil
}

This is way more elegant than what you are currently trying to do.

…e to be resolved

pkg/notify/main.go

pkg/notify/discord.go

pkg/notify/slack.go

pkg/notify/main.go

fristonio · 2019-08-03T17:11:19Z

Also resolve the conflicts in the pull request.

- minor changes fixed -added documentation for WebHook URL

fristonio · 2019-08-04T09:45:42Z

@shubhamgupta2956 show me a demo for this in the lab sometime today and get this merged.

…r slack as well as discord can be called from same function

pkg/notify/main.go

Removed return statement from SendNotification function so that now it can send notification to discord if it fails to send it to slack

- Spelling correction

_examples/example.config.toml

fristonio · 2019-09-24T16:52:49Z

pkg/notify/main.go

+
+//In the Discord notification provider it was using the same payload which was used for slack.
+//By writing "/slack" in the discord WebHookURL, it execute Slack-Compatible Webhook
+func NewNotifier(URL string, ProviderType ProviderTypeEnum) Notifier {


Validate URL here

fristonio · 2019-09-24T16:53:19Z

pkg/notify/main.go

+
+func (req *Request) FillReqParams() error {
+	req.PostPayload = PostPayload{
+		Username: "Beast",


Put these values in notify/defaults.go and use from there.

fristonio · 2019-09-28T22:36:17Z

_examples/example.config.toml

@@ -28,3 +28,8 @@ ssh_key = "/home/vsts/.beast/secret.key"
 url = "[email protected]:sdslabs/nonexistent.git"
 name = "nonexistent"
 branch = "nonexistent"
+
+[[webhooks]]
+url = "https://discordapp.com/api/webhooks/615970326093758464/Dui7gVZVIaGvdys87I9O2Gn9Bx3ssNkdgkxSf3etEXN0ClxlNYSeTflbJd0obO81a_m1"


Actual token kyu hai example toml me?

fristonio · 2019-09-28T22:36:54Z

core/config/config.go

@@ -86,8 +86,7 @@ type BeastConfig struct {
 	AvailableSidecars  []string  `toml:"available_sidecars"`
 	GitRemote          GitRemote `toml:"remote"`
 	JWTSecret          string    `toml:"jwt_secret"`
-	SlackWebHookURL    string    `toml:"slack_webhook"`
-	DiscordWebHookURL  string    `toml:"discord_webhook"`
+	Webhooks           []Webhook `toml:webhook`


Name this NotificationWebhooks

fristonio · 2019-09-28T22:37:14Z

core/config/config.go

@@ -216,6 +215,12 @@ func (config *GitRemote) ValidateGitConfig() error {
 	return nil
 }

+type Webhook struct {


NotificationWebhook

fristonio · 2019-09-28T22:37:46Z

core/config/config.go

+type Webhook struct {
+	URL         string `toml:"url"`
+	ServiceName string `toml:"service_name"`
+	Status      bool   `toml:"status"`


What is meant by Status - true or false. Change the name to something more sensible - Active

fristonio · 2019-09-28T22:38:05Z

core/manager/challenge.go

@@ -530,7 +530,7 @@ func StartUndeployChallenge(challengeName string, purge bool) error {
 		notify.SendNotification(notify.Success, msg)
 	}

-	log.Infof("Notification for the event sent to slack.")
+	log.Infof("Notification for the event sent.")


Remove the f from Infof

fristonio · 2019-09-28T22:39:18Z

pkg/notify/notification_constants.go

@@ -15,3 +15,9 @@ const (
 	WarningColor NotificationColor = "#FF4500"
 	SuccessColor NotificationColor = "#32CD32"
 )
+
+const (


Change the file name to constants.go only, since it is inside the notify package we dont need the noise of notification in the name.

fristonio · 2019-10-10T21:35:55Z

pkg/notify/main.go

+func NewNotifier(URL string, ProviderType ProviderTypeEnum) Notifier {
+	url, err := url.ParseRequestURI(URL)
+	if url == nil || err != nil {
+		fmt.Errorf("Invalid notification webhook URL")


return from here if there is an error.
Use error log for logging error.

fristonio · 2019-10-10T21:36:54Z

core/config/config.go

+type NotificationWebhook struct {
+	URL         string `toml:"url"`
+	ServiceName string `toml:"service_name"`
+	Active      bool   `toml:"status"`


toml should also be active

fristonio · 2019-10-10T21:37:18Z

_examples/example.config.toml

@@ -28,3 +28,8 @@ ssh_key = "/home/vsts/.beast/secret.key"
 url = "[email protected]:sdslabs/nonexistent.git"
 name = "nonexistent"
 branch = "nonexistent"
+
+[[webhooks]]


Add example for slack too.
Change the field status to active

wryonik added 2 commits June 9, 2019 05:39

added notification support for discord

f891a4b

removed changes from go.sum

1edf4d8

wryonik requested a review from fristonio June 9, 2019 00:13

changed discord icon

fedfd99

fristonio requested changes Jun 13, 2019

View reviewed changes

wryonik added 4 commits June 14, 2019 10:11

tried to improve notification structure

812cdc0

tried to implement interface for notifier

eed16a0

tried to implement interface for notifier. Some errors are still ther…

4c1f818

…e to be resolved

tried to implement interface for notifier. Some errors are still ther…

3ee5816

…e to be resolved

wryonik commented Jun 15, 2019

View reviewed changes

pkg/notify/main.go Show resolved Hide resolved

solved some errors. Some remains with sending payload

e946b1f

wryonik commented Jun 18, 2019

View reviewed changes

pkg/notify/discord.go Outdated Show resolved Hide resolved

wryonik commented Jun 18, 2019

View reviewed changes

pkg/notify/slack.go Outdated Show resolved Hide resolved

wryonik added 3 commits June 19, 2019 16:01

enumeration of notification providers

7e19304

completed notification for discord

7dea82c

completed notification for discord

5fae9bf

wryonik requested a review from fristonio June 20, 2019 20:04

removed changes from go.sum

e7b4349

fristonio requested changes Aug 3, 2019

View reviewed changes

pkg/notify/main.go Outdated Show resolved Hide resolved

pkg/notify/main.go Outdated Show resolved Hide resolved

pkg/notify/main.go Outdated Show resolved Hide resolved

pkg/notify/main.go Outdated Show resolved Hide resolved

wryonik and others added 3 commits August 4, 2019 02:26

Review changes fixed

4a840a4

- minor changes fixed -added documentation for WebHook URL

Merge branch 'master' into added_more_notification_channels

c485521

Formatting errors fixed

2603ae6

Changed notification functions such that now both the notification fo…

4b5eb5e

…r slack as well as discord can be called from same function

fristonio requested changes Aug 5, 2019

View reviewed changes

pkg/notify/main.go Outdated Show resolved Hide resolved

pkg/notify/main.go Outdated Show resolved Hide resolved

pkg/notify/main.go Outdated Show resolved Hide resolved

Minor review changes

e34c8b3

Removed return statement from SendNotification function so that now it can send notification to discord if it fails to send it to slack

wryonik requested a review from fristonio August 5, 2019 16:38

wryonik added 2 commits August 27, 2019 01:43

Minor review changes

c7b7ac6

- Spelling correction

Minor changes

d13953b

Review changes fixed

681cead

kokil87 requested changes Sep 27, 2019

View reviewed changes

_examples/example.config.toml Outdated Show resolved Hide resolved

Removed discord test server link from example.config.toml

d091dbf

kokil87 previously approved these changes Sep 28, 2019

View reviewed changes

fristonio requested changes Sep 28, 2019

View reviewed changes

Some changes fixed

6215179

wryonik dismissed kokil87’s stale review via 6215179 October 9, 2019 17:03

fristonio requested changes Oct 10, 2019

View reviewed changes

wryonik added 2 commits October 11, 2019 03:42

Minor changes fixes

ee0bbdb

Documentation update

6e5fd76

fristonio approved these changes Oct 10, 2019

View reviewed changes

fristonio merged commit 2d9c536 into master Oct 10, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

added notification support for discord #157

added notification support for discord #157

wryonik commented Jun 9, 2019

fristonio left a comment

fristonio commented Aug 3, 2019

fristonio commented Aug 4, 2019

fristonio Sep 24, 2019

fristonio Sep 24, 2019

fristonio Sep 28, 2019

fristonio Sep 28, 2019

fristonio Sep 28, 2019

fristonio Sep 28, 2019

fristonio Sep 28, 2019

fristonio Sep 28, 2019

fristonio Oct 10, 2019

fristonio Oct 10, 2019

fristonio Oct 10, 2019

added notification support for discord #157

added notification support for discord #157

Conversation

wryonik commented Jun 9, 2019

fristonio left a comment

Choose a reason for hiding this comment

fristonio commented Aug 3, 2019

fristonio commented Aug 4, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment