chore: update notifications-engine (#321)

Signed-off-by: Ryota Sakamoto <sakamo.ryota+github@gmail.com>

Author: ryota-sakamoto

bot/server.go

@@ -106,7 +106,7 @@ func (s *server) updateSubscription(service string, recipient string, subscribe
 		return "", err
 	}
 	oldAnnotations := copyStringMap(obj.GetAnnotations())
-	annotations := subscriptions.Annotations(obj.GetAnnotations())
+	annotations := subscriptions.NewAnnotations(obj.GetAnnotations())
 	if subscribe {
 		annotations.Subscribe(opts.Trigger, service, recipient)
 	} else {
@@ -139,7 +139,7 @@ func (s *server) listSubscriptions(service string, recipient string) (string, er
 	}
 	var apps []string
 	for _, app := range appList.Items {
-		if subscriptions.Annotations(app.GetAnnotations()).Has(service, recipient) {
+		if subscriptions.NewAnnotations(app.GetAnnotations()).Has(service, recipient) {
 			apps = append(apps, fmt.Sprintf("%s/%s", app.GetNamespace(), app.GetName()))
 		}
 	}
@@ -149,7 +149,7 @@ func (s *server) listSubscriptions(service string, recipient string) (string, er
 	}
 	var appProjs []string
 	for _, appProj := range appProjList.Items {
-		if subscriptions.Annotations(appProj.GetAnnotations()).Has(service, recipient) {
+		if subscriptions.NewAnnotations(appProj.GetAnnotations()).Has(service, recipient) {
 			appProjs = append(appProjs, fmt.Sprintf("%s/%s", appProj.GetNamespace(), appProj.GetName()))
 		}
 	}

controller/controller.go

@@ -74,7 +74,7 @@ func (c *notificationController) alterDestinations(obj v1.Object, destinations s
 	}
 
 	if proj := getAppProj(app, c.appProjInformer); proj != nil {
-		destinations.Merge(subscriptions.Annotations(proj.GetAnnotations()).GetDestinations(cfg.DefaultTriggers, cfg.ServiceDefaultTriggers))
+		destinations.Merge(subscriptions.NewAnnotations(proj.GetAnnotations()).GetDestinations(cfg.DefaultTriggers, cfg.ServiceDefaultTriggers))
 		destinations.Merge(settings.GetLegacyDestinations(proj.GetAnnotations(), cfg.DefaultTriggers, cfg.ServiceDefaultTriggers))
 	}
 	return destinations

docs/services/slack.md

@@ -22,43 +22,43 @@ The Slack notification service configuration includes following settings:
 ![3](https://user-images.githubusercontent.com/426437/73604310-4d495b80-4543-11ea-8576-09cd91aea0e5.png)
 1. Scroll back to the top, click 'Install App to Workspace' button and confirm the installation.
 ![4](https://user-images.githubusercontent.com/426437/73604311-4d495b80-4543-11ea-9155-9d216b20ec86.png)
-1. Once installation is completed copy the OAuth token. 
+1. Once installation is completed copy the OAuth token.
 ![5](https://user-images.githubusercontent.com/426437/73604312-4d495b80-4543-11ea-832b-a9d9d5e4bc29.png)
 
 1. Create a public or private channel, for this example `my_channel`
 1. Invite your slack bot to this channel **otherwise slack bot won't be able to deliver notifications to this channel**
-8. Store Oauth access token in `argocd-notifications-secret` secret
- 
-```yaml
-apiVersion: v1
-kind: Secret
-metadata:
-  name: <secret-name>
-stringData:
-  slack-token: <Oauth-access-token>
-```
+1. Store Oauth access token in `argocd-notifications-secret` secret
 
-9. Define service type slack in data section of `argocd-notifications-cm` configmap: 
+    ```yaml
+    apiVersion: v1
+    kind: Secret
+    metadata:
+      name: <secret-name>
+    stringData:
+      slack-token: <Oauth-access-token>
+    ```
+
+1. Define service type slack in data section of `argocd-notifications-cm` configmap:
 service
-```yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: <config-map-name>
-data:
-  service.slack: |
-    token: $slack-token
-```
+    ```yaml
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: <config-map-name>
+    data:
+      service.slack: |
+        token: $slack-token
+    ```
 
-10. Add annotation in application yaml file to enable notifications for specific argocd app
+1. Add annotation in application yaml file to enable notifications for specific argocd app
 
-```yaml
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  annotations:
-    notifications.argoproj.io/subscribe.on-sync-succeeded.slack: my_channel
-```
+    ```yaml
+    apiVersion: argoproj.io/v1alpha1
+    kind: Application
+    metadata:
+      annotations:
+        notifications.argoproj.io/subscribe.on-sync-succeeded.slack: my_channel
+    ```
 
 ## Templates
 

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.2.1-0.20210729153923-a15e78044105
+	github.com/argoproj/notifications-engine v0.2.1-0.20210801151500-3203039170af
 	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.2.1-0.20210729153923-a15e78044105 h1:V5cNAPIxNMYr6EIL2dRSZa5qCsqkXa+KknuZXYb9JIg=
-github.com/argoproj/notifications-engine v0.2.1-0.20210729153923-a15e78044105/go.mod h1:rKhm9LtebGKgLA/UtPtBeRUrrS/CT0U5az1jSfUiipw=
+github.com/argoproj/notifications-engine v0.2.1-0.20210801151500-3203039170af h1:zEk/nOliLkkTOUnD/JEg/IaAksHfLQURlbgOHku6u90=
+github.com/argoproj/notifications-engine v0.2.1-0.20210801151500-3203039170af/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=