refactor: upgrade notifications-engine and switch to WithAlterDestinations (#278)

Signed-off-by: Alexander Matyushentsev <[email protected]>

Author: Alexander Matyushentsev

controller/controller.go

@@ -63,23 +63,21 @@ func NewController(
 			return !isAppSyncStatusRefreshed(app, log.WithField("app", obj.GetName())), "sync status out of date"
 		}),
 		controller.WithMetricsRegistry(registry),
-		controller.WithAdditionalDestinations(res.getAdditionalDestinations))
+		controller.WithAlterDestinations(res.alterDestinations))
 	return res
 }
 
-func (c *notificationController) getAdditionalDestinations(obj v1.Object, cfg api.Config) services.Destinations {
-	res := services.Destinations{}
-
+func (c *notificationController) alterDestinations(obj v1.Object, destinations services.Destinations, cfg api.Config) services.Destinations {
 	app, ok := (obj).(*unstructured.Unstructured)
 	if !ok {
-		return res
+		return destinations
 	}
 
 	if proj := getAppProj(app, c.appProjInformer); proj != nil {
-		res.Merge(subscriptions.Annotations(proj.GetAnnotations()).GetDestinations(cfg.DefaultTriggers, cfg.ServiceDefaultTriggers))
-		res.Merge(settings.GetLegacyDestinations(proj.GetAnnotations(), cfg.DefaultTriggers, cfg.ServiceDefaultTriggers))
+		destinations.Merge(subscriptions.Annotations(proj.GetAnnotations()).GetDestinations(cfg.DefaultTriggers, cfg.ServiceDefaultTriggers))
+		destinations.Merge(settings.GetLegacyDestinations(proj.GetAnnotations(), cfg.DefaultTriggers, cfg.ServiceDefaultTriggers))
 	}
-	return res
+	return destinations
 }
 
 func newInformer(resClient dynamic.ResourceInterface, selector string) cache.SharedIndexInformer {

controller/controller_test.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"testing"
 
+	"github.com/argoproj/notifications-engine/pkg/services"
+
 	. "github.com/argoproj-labs/argocd-notifications/testing"
 
 	"github.com/argoproj/notifications-engine/pkg/api"
@@ -51,7 +53,7 @@ func TestSendsNotificationIfProjectTriggered(t *testing.T) {
 	ctrl, _, err := newController(t, ctx, NewFakeClient(app, appProj))
 	assert.NoError(t, err)
 
-	dests := ctrl.getAdditionalDestinations(app, api.Config{})
+	dests := ctrl.alterDestinations(app, services.Destinations{}, api.Config{})
 
 	assert.NoError(t, err)
 	assert.NotEmpty(t, dests)

go.mod

@@ -4,7 +4,7 @@ go 1.16
 
 require (
 	github.com/argoproj/argo-cd/v2 v2.0.0-rc3
-	github.com/argoproj/notifications-engine v0.1.1-0.20210503221649-02b903bd1840
+	github.com/argoproj/notifications-engine v0.1.1-0.20210504060655-93bff0a78a1e
 	github.com/evanphx/json-patch v4.9.0+incompatible
 	github.com/ghodss/yaml v1.0.0
 	github.com/golang/mock v1.4.4

go.sum

@@ -93,8 +93,8 @@ github.com/argoproj/argo-cd/v2 v2.0.0-rc3 h1:jBuz8qqLL0gG6Nb892x3+eP+v/wjQpkdSOl
 github.com/argoproj/argo-cd/v2 v2.0.0-rc3/go.mod h1:Rw7fuyae0v8b3KMJoZp8jf5A2tBP2dQ8uWj9HTRZITo=
 github.com/argoproj/gitops-engine v0.3.1 h1:wM4RUzH54sWdchD7Ws8UdAIsjk08BmjN9bLuW79xKWk=
 github.com/argoproj/gitops-engine v0.3.1/go.mod h1:IBHhAkqlC+3r/wBWUitWSidQhPzlLoSTWp2htq3dyQk=
-github.com/argoproj/notifications-engine v0.1.1-0.20210503221649-02b903bd1840 h1:eZ6eZ2e9K1YH5mbwneHcP6CFPHWaQ7vv86BBatgIybs=
-github.com/argoproj/notifications-engine v0.1.1-0.20210503221649-02b903bd1840/go.mod h1:rKhm9LtebGKgLA/UtPtBeRUrrS/CT0U5az1jSfUiipw=
+github.com/argoproj/notifications-engine v0.1.1-0.20210504060655-93bff0a78a1e h1:48/K05DfH4Et57sg3XVyuxeG2EHumn67AtAa+0l3/Zo=
+github.com/argoproj/notifications-engine v0.1.1-0.20210504060655-93bff0a78a1e/go.mod h1:rKhm9LtebGKgLA/UtPtBeRUrrS/CT0U5az1jSfUiipw=
 github.com/argoproj/pkg v0.2.0 h1:ETgC600kr8WcAi3MEVY5sA1H7H/u1/IysYOobwsZ8No=
 github.com/argoproj/pkg v0.2.0/go.mod h1:F4TZgInLUEjzsWFB/BTJBsewoEy0ucnKSq6vmQiD/yc=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=