refactor: upgrade notifications-engine version (#277)

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

Author: Alexander Matyushentsev

controller/controller.go

@@ -7,8 +7,6 @@ import (
 	"time"
 
 	"github.com/argoproj-labs/argocd-notifications/shared/argocd"
-	"k8s.io/client-go/kubernetes"
-
 	"github.com/argoproj-labs/argocd-notifications/shared/k8s"
 	"github.com/argoproj-labs/argocd-notifications/shared/settings"
 
@@ -22,6 +20,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/dynamic"
+	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
 )
 
@@ -42,7 +41,7 @@ func NewController(
 	appLabelSelector string,
 	registry *controller.MetricsRegistry,
 ) *notificationController {
-	appClient := k8s.NewAppClient(client, namespace)
+	appClient := client.Resource(k8s.Applications)
 	appInformer := newInformer(appClient, appLabelSelector)
 	appProjInformer := newInformer(k8s.NewAppProjClient(client, namespace), "")
 	secretInformer := k8s.NewSecretInformer(k8sClient, namespace)
@@ -56,17 +55,27 @@ func NewController(
 		appProjInformer:   appProjInformer,
 		apiFactory:        apiFactory}
 	res.ctrl = controller.NewController(appClient, appInformer, apiFactory,
-		controller.WithSkipProcessing(func(obj *unstructured.Unstructured) (bool, string) {
-			return !isAppSyncStatusRefreshed(obj, log.WithField("app", obj.GetName())), "sync status out of date"
+		controller.WithSkipProcessing(func(obj v1.Object) (bool, string) {
+			app, ok := (obj).(*unstructured.Unstructured)
+			if !ok {
+				return false, ""
+			}
+			return !isAppSyncStatusRefreshed(app, log.WithField("app", obj.GetName())), "sync status out of date"
 		}),
 		controller.WithMetricsRegistry(registry),
 		controller.WithAdditionalDestinations(res.getAdditionalDestinations))
 	return res
 }
 
-func (c *notificationController) getAdditionalDestinations(obj *unstructured.Unstructured, cfg api.Config) services.Destinations {
+func (c *notificationController) getAdditionalDestinations(obj v1.Object, cfg api.Config) services.Destinations {
 	res := services.Destinations{}
-	if proj := getAppProj(obj, c.appProjInformer); proj != nil {
+
+	app, ok := (obj).(*unstructured.Unstructured)
+	if !ok {
+		return res
+	}
+
+	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))
 	}
@@ -114,7 +123,7 @@ func (c *notificationController) Init(ctx context.Context) error {
 }
 
 func (c *notificationController) Run(ctx context.Context, processors int) {
-	c.ctrl.Run(ctx, processors)
+	c.ctrl.Run(processors, ctx.Done())
 }
 
 func getAppProj(app *unstructured.Unstructured, appProjInformer cache.SharedIndexInformer) *unstructured.Unstructured {

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.20210503203905-e8ac53e2f18e
+	github.com/argoproj/notifications-engine v0.1.1-0.20210503221649-02b903bd1840
 	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.20210503203905-e8ac53e2f18e h1:XxM9ghkKMVHy92za2Q0dMHgROZnawgJy3btp21tk33E=
-github.com/argoproj/notifications-engine v0.1.1-0.20210503203905-e8ac53e2f18e/go.mod h1:rKhm9LtebGKgLA/UtPtBeRUrrS/CT0U5az1jSfUiipw=
+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/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=