Refactor notifies to use Flux Event API v1beta1

Signed-off-by: Stefan Prodan <[email protected]>

Author: stefanprodan

controllers/alert_controller_test.go

@@ -39,9 +39,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 
+	eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
 	"github.com/fluxcd/pkg/runtime/conditions"
-	"github.com/fluxcd/pkg/runtime/events"
 
 	apiv1 "github.com/fluxcd/notification-controller/api/v1beta2"
 	"github.com/fluxcd/notification-controller/internal/server"
@@ -275,7 +275,7 @@ func TestAlertReconciler_EventHandler(t *testing.T) {
 		return conditions.IsReady(&obj)
 	}, 30*time.Second, time.Second).Should(BeTrue())
 
-	event := events.Event{
+	event := eventv1.Event{
 		InvolvedObject: corev1.ObjectReference{
 			Kind:      "Bucket",
 			Name:      "hyacinth",
@@ -315,49 +315,49 @@ func TestAlertReconciler_EventHandler(t *testing.T) {
 
 	tests := []struct {
 		name            string
-		modifyEventFunc func(e events.Event) events.Event
+		modifyEventFunc func(e eventv1.Event) eventv1.Event
 		forwarded       bool
 	}{
 		{
 			name:            "forwards when source is a match",
-			modifyEventFunc: func(e events.Event) events.Event { return e },
+			modifyEventFunc: func(e eventv1.Event) eventv1.Event { return e },
 			forwarded:       true,
 		},
 		{
 			name: "drops event when source Kind does not match",
-			modifyEventFunc: func(e events.Event) events.Event {
+			modifyEventFunc: func(e eventv1.Event) eventv1.Event {
 				e.InvolvedObject.Kind = "GitRepository"
 				return e
 			},
 			forwarded: false,
 		},
 		{
 			name: "drops event when source name does not match",
-			modifyEventFunc: func(e events.Event) events.Event {
+			modifyEventFunc: func(e eventv1.Event) eventv1.Event {
 				e.InvolvedObject.Name = "slop"
 				return e
 			},
 			forwarded: false,
 		},
 		{
 			name: "drops event when source namespace does not match",
-			modifyEventFunc: func(e events.Event) events.Event {
+			modifyEventFunc: func(e eventv1.Event) eventv1.Event {
 				e.InvolvedObject.Namespace = "all-buckets"
 				return e
 			},
 			forwarded: false,
 		},
 		{
 			name: "drops event that is matched by exclusion",
-			modifyEventFunc: func(e events.Event) events.Event {
+			modifyEventFunc: func(e eventv1.Event) eventv1.Event {
 				e.Message = "this is excluded"
 				return e
 			},
 			forwarded: false,
 		},
 		{
 			name: "forwards events when name wildcard is used",
-			modifyEventFunc: func(e events.Event) events.Event {
+			modifyEventFunc: func(e eventv1.Event) eventv1.Event {
 				e.InvolvedObject.Kind = "Kustomization"
 				e.InvolvedObject.Name = "test"
 				e.InvolvedObject.Namespace = namespace
@@ -368,7 +368,7 @@ func TestAlertReconciler_EventHandler(t *testing.T) {
 		},
 		{
 			name: "forwards events when the label matches",
-			modifyEventFunc: func(e events.Event) events.Event {
+			modifyEventFunc: func(e eventv1.Event) eventv1.Event {
 				e.InvolvedObject.Kind = "GitRepository"
 				e.InvolvedObject.Name = "podinfo"
 				e.InvolvedObject.APIVersion = "source.toolkit.fluxcd.io/v1beta1"
@@ -380,7 +380,7 @@ func TestAlertReconciler_EventHandler(t *testing.T) {
 		},
 		{
 			name: "drops events when the labels don't match",
-			modifyEventFunc: func(e events.Event) events.Event {
+			modifyEventFunc: func(e eventv1.Event) eventv1.Event {
 				e.InvolvedObject.Kind = "GitRepository"
 				e.InvolvedObject.Name = "podinfo-two"
 				e.InvolvedObject.APIVersion = "source.toolkit.fluxcd.io/v1beta1"
@@ -392,7 +392,7 @@ func TestAlertReconciler_EventHandler(t *testing.T) {
 		},
 		{
 			name: "drops events for cross-namespace sources",
-			modifyEventFunc: func(e events.Event) events.Event {
+			modifyEventFunc: func(e eventv1.Event) eventv1.Event {
 				e.InvolvedObject.Kind = "Kustomization"
 				e.InvolvedObject.Name = "test"
 				e.InvolvedObject.Namespace = "test"

docs/spec/v1beta2/events.md

@@ -41,7 +41,7 @@ In the above example:
 ## Event structure
 
 The Go type that defines the event structure can be found in the
-[fluxcd/pkg/runtime/events](https://github.com/fluxcd/pkg/blob/main/runtime/events/event.go)
+[fluxcd/pkg/apis/event/v1beta1](https://github.com/fluxcd/pkg/blob/main/apis/event/v1beta1/event.go)
 package.
 
 ## Rate limiting

go.mod

@@ -5,34 +5,35 @@ go 1.18
 replace github.com/fluxcd/notification-controller/api => ./api
 
 require (
-	github.com/AdaLogics/go-fuzz-headers v0.0.0-20221007124625-37f5449ff7df
+	github.com/AdaLogics/go-fuzz-headers v0.0.0-20221103172237-443f56ff4ba8
 	github.com/Azure/azure-amqp-common-go/v3 v3.2.3
-	github.com/Azure/azure-event-hubs-go/v3 v3.3.18
+	github.com/Azure/azure-event-hubs-go/v3 v3.3.19
 	github.com/containrrr/shoutrrr v0.6.1
 	github.com/fluxcd/notification-controller/api v0.28.0
+	github.com/fluxcd/pkg/apis/event v0.1.0
 	github.com/fluxcd/pkg/apis/meta v0.17.0
 	github.com/fluxcd/pkg/masktoken v0.2.0
-	github.com/fluxcd/pkg/runtime v0.22.0
+	github.com/fluxcd/pkg/runtime v0.23.0
 	github.com/fluxcd/pkg/ssa v0.21.0
 	github.com/getsentry/sentry-go v0.13.0
 	github.com/go-logr/logr v1.2.3
 	github.com/google/go-github/v41 v41.0.0
 	github.com/hashicorp/go-retryablehttp v0.7.1
 	github.com/ktrysmt/go-bitbucket v0.9.54
 	github.com/microsoft/azure-devops-go-api/azuredevops/v6 v6.0.1
-	github.com/onsi/gomega v1.22.1
+	github.com/onsi/gomega v1.24.0
 	github.com/sethvargo/go-limiter v0.7.2
 	github.com/slok/go-http-metrics v0.10.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.8.0
+	github.com/stretchr/testify v1.8.1
 	github.com/whilp/git-urls v1.0.0
-	github.com/xanzy/go-gitlab v0.73.1
+	github.com/xanzy/go-gitlab v0.74.0
 	golang.org/x/oauth2 v0.1.0
 	k8s.io/api v0.25.3
 	k8s.io/apimachinery v0.25.3
 	k8s.io/client-go v0.25.3
-	sigs.k8s.io/cli-utils v0.33.0
-	sigs.k8s.io/controller-runtime v0.13.0
+	sigs.k8s.io/cli-utils v0.34.0
+	sigs.k8s.io/controller-runtime v0.13.1
 	sigs.k8s.io/yaml v1.3.0
 )
 
@@ -55,23 +56,23 @@ replace golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220518034528-6f7dac9
 
 require (
 	cloud.google.com/go v0.99.0 // indirect
-	github.com/Azure/azure-sdk-for-go v53.4.0+incompatible // indirect
+	github.com/Azure/azure-sdk-for-go v65.0.0+incompatible // indirect
 	github.com/Azure/go-amqp v0.17.0 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
-	github.com/Azure/go-autorest/autorest v0.11.27 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
+	github.com/Azure/go-autorest/autorest v0.11.28 // indirect
+	github.com/Azure/go-autorest/autorest/adal v0.9.21 // indirect
 	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
 	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
 	github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
 	github.com/Azure/go-autorest/logger v0.2.1 // indirect
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
-	github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
+	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
+	github.com/chai2010/gettext-go v1.0.2 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/devigned/tab v0.1.1 // indirect
@@ -88,7 +89,7 @@ require (
 	github.com/go-openapi/jsonreference v0.19.5 // indirect
 	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
+	github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/btree v1.0.1 // indirect
@@ -112,7 +113,7 @@ require (
 	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
-	github.com/mitchellh/mapstructure v1.4.3 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -128,7 +129,7 @@ require (
 	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/rogpeppe/go-internal v1.8.0 // indirect
 	github.com/russross/blackfriday v1.5.2 // indirect
-	github.com/spf13/cobra v1.4.0 // indirect
+	github.com/spf13/cobra v1.5.0 // indirect
 	github.com/xlab/treeprint v1.1.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
@@ -146,13 +147,13 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.25.0 // indirect
-	k8s.io/cli-runtime v0.25.2 // indirect
-	k8s.io/component-base v0.25.2 // indirect
+	k8s.io/apiextensions-apiserver v0.25.3 // indirect
+	k8s.io/cli-runtime v0.25.3 // indirect
+	k8s.io/component-base v0.25.3 // indirect
 	k8s.io/klog/v2 v2.80.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
-	k8s.io/kubectl v0.24.0 // indirect
-	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
+	k8s.io/kubectl v0.25.3 // indirect
+	k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
 	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
 	sigs.k8s.io/kustomize/api v0.12.1 // indirect
 	sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect