CR-8833 (#211)

* reporting analysisruns

* bump

* removed redundant

* log

* typo

* refactoring reporter creation

* fixed group and version

* bump

* removed comment

* refactoring

* removed comments

* making gvk private

* using store values

* removed redundant

* codegen

* renaming

* Revert "codegen"

This reverts commit 10797ed.

* Revert "renaming"

This reverts commit 5bdcd85.

* bump

* gvr instead of gvk

* name fix

* e2e

* trigger e2e

Author: elad-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.235
+VERSION=v0.0.236
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/runtime.go

@@ -48,7 +48,7 @@ import (
 	apstore "github.com/argoproj-labs/argocd-autopilot/pkg/store"
 	aputil "github.com/argoproj-labs/argocd-autopilot/pkg/util"
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	argowf "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow"
+	aev1alpha1 "github.com/argoproj/argo-events/pkg/apis/eventsource/v1alpha1"
 
 	"github.com/Masterminds/semver/v3"
 	kubeutil "github.com/codefresh-io/cli-v2/pkg/util/kube"
@@ -78,7 +78,7 @@ type (
 		IngressController              string
 		Insecure                       bool
 		InstallDemoResources           bool
-		SkipClusterChecks                bool
+		SkipClusterChecks              bool
 		Version                        *semver.Version
 		GsCloneOpts                    *git.CloneOptions
 		InsCloneOpts                   *git.CloneOptions
@@ -106,11 +106,16 @@ type (
 		CloneOpts    *git.CloneOptions
 		CommonConfig *runtime.CommonConfig
 	}
-	reporterCreateOptions struct {
-		reporterName string
+
+	gvr struct {
 		resourceName string
 		group        string
 		version      string
+	}
+
+	reporterCreateOptions struct {
+		reporterName string
+		gvr          []gvr
 		saName       string
 	}
 
@@ -473,7 +478,7 @@ func getComponents(rt *runtime.Runtime, opts *RuntimeInstallOptions) []string {
 	}
 
 	//  should find a more dynamic way to get these additional components
-	additionalComponents := []string{"events-reporter", "workflow-reporter", "replicaset-reporter", "rollout-reporter"}
+	additionalComponents := []string{"events-reporter", "workflow-reporter", "rollout-reporter"}
 	for _, additionalComponentName := range additionalComponents {
 		componentFullName := fmt.Sprintf("%s-%s", opts.RuntimeName, additionalComponentName)
 		componentNames = append(componentNames, componentFullName)
@@ -784,30 +789,38 @@ func installComponents(ctx context.Context, opts *RuntimeInstallOptions, rt *run
 	if err = createReporter(
 		ctx, opts.InsCloneOpts, opts, reporterCreateOptions{
 			reporterName: store.Get().WorkflowReporterName,
-			resourceName: store.Get().WorkflowResourceName,
-			group:        argowf.Group,
-			version:      argowf.Version,
-			saName:       store.Get().CodefreshSA,
+			gvr: []gvr{
+				{
+					resourceName: store.Get().WorkflowResourceName,
+					group:        "argoproj.io",
+					version:      "v1alpha1",
+				},
+			},
+			saName: store.Get().CodefreshSA,
 		}); err != nil {
 		return fmt.Errorf("failed to create workflows-reporter: %w", err)
 	}
 
-	if err = createReporter(ctx, opts.InsCloneOpts, opts, reporterCreateOptions{
-		reporterName: store.Get().ReplicaSetReporterName,
-		resourceName: store.Get().ReplicaSetResourceName,
-		group:        "apps",
-		version:      "v1",
-		saName:       store.Get().ReplicaSetReporterServiceAccount,
-	}); err != nil {
-		return fmt.Errorf("failed to create replicaset-reporter: %w", err)
-	}
-
 	if err = createReporter(ctx, opts.InsCloneOpts, opts, reporterCreateOptions{
 		reporterName: store.Get().RolloutReporterName,
-		resourceName: store.Get().RolloutResourceName,
-		group:        "argoproj.io",
-		version:      "v1alpha1",
-		saName:       store.Get().RolloutReporterServiceAccount,
+		gvr: []gvr{
+			{
+				resourceName: store.Get().RolloutResourceName,
+				group:        "argoproj.io",
+				version:      "v1alpha1",
+			},
+			{
+				resourceName: store.Get().ReplicaSetResourceName,
+				group:        "apps",
+				version:      "v1",
+			},
+			{
+				resourceName: store.Get().AnalysisRunResourceName,
+				group:        "argoproj.io",
+				version:      "v1alpha1",
+			},
+		},
+		saName: store.Get().RolloutReporterServiceAccount,
 	}); err != nil {
 		return fmt.Errorf("failed to create rollout-reporter: %w", err)
 	}
@@ -1501,7 +1514,8 @@ func createEventsReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts
 		return err
 	}
 
-	if err := createSensor(repofs, store.Get().EventsReporterName, resPath, opts.RuntimeName, store.Get().EventsReporterName, "events", "data"); err != nil {
+	eventsReporterTriggers := []string{"events"}
+	if err := createSensor(repofs, store.Get().EventsReporterName, resPath, opts.RuntimeName, store.Get().EventsReporterName, eventsReporterTriggers, "data"); err != nil {
 		return err
 	}
 
@@ -1560,7 +1574,12 @@ func createReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts *Runt
 		return err
 	}
 
-	if err := createSensor(repofs, reporterCreateOpts.reporterName, resPath, opts.RuntimeName, reporterCreateOpts.reporterName, reporterCreateOpts.resourceName, "data.object"); err != nil {
+	var triggerNames []string
+	for _, gvr := range reporterCreateOpts.gvr {
+		triggerNames = append(triggerNames, gvr.resourceName)
+	}
+
+	if err := createSensor(repofs, reporterCreateOpts.reporterName, resPath, opts.RuntimeName, reporterCreateOpts.reporterName, triggerNames, "data.object"); err != nil {
 		return err
 	}
 
@@ -1729,31 +1748,44 @@ func createEventsReporterEventSource(repofs fs.FS, path, namespace string, insec
 }
 
 func createReporterEventSource(repofs fs.FS, path, namespace string, reporterCreateOpts reporterCreateOptions) error {
-	eventSource := eventsutil.CreateEventSource(&eventsutil.CreateEventSourceOptions{
+	var eventSource *aev1alpha1.EventSource
+	var options *eventsutil.CreateEventSourceOptions
+
+	var resourceNames []string
+	for _, gvr := range reporterCreateOpts.gvr {
+		resourceNames = append(resourceNames, gvr.resourceName)
+	}
+
+	options = &eventsutil.CreateEventSourceOptions{
 		Name:               reporterCreateOpts.reporterName,
 		Namespace:          namespace,
 		ServiceAccountName: reporterCreateOpts.saName,
 		EventBusName:       store.Get().EventBusName,
-		Resource: map[string]eventsutil.CreateResourceEventSourceOptions{
-			reporterCreateOpts.resourceName: {
-				Group:     reporterCreateOpts.group,
-				Version:   reporterCreateOpts.version,
-				Resource:  reporterCreateOpts.resourceName,
-				Namespace: namespace,
-			},
-		},
-	})
+		Resource:           map[string]eventsutil.CreateResourceEventSourceOptions{},
+	}
+
+	for i, name := range resourceNames {
+		options.Resource[name] = eventsutil.CreateResourceEventSourceOptions{
+			Group:     reporterCreateOpts.gvr[i].group,
+			Version:   reporterCreateOpts.gvr[i].version,
+			Resource:  reporterCreateOpts.gvr[i].resourceName,
+			Namespace: namespace,
+		}
+	}
+
+	eventSource = eventsutil.CreateEventSource(options)
+
 	return repofs.WriteYamls(repofs.Join(path, "event-source.yaml"), eventSource)
 }
 
-func createSensor(repofs fs.FS, name, path, namespace, eventSourceName, trigger, dataKey string) error {
+func createSensor(repofs fs.FS, name, path, namespace, eventSourceName string, triggers []string, dataKey string) error {
 	sensor := eventsutil.CreateSensor(&eventsutil.CreateSensorOptions{
 		Name:            name,
 		Namespace:       namespace,
 		EventSourceName: eventSourceName,
 		EventBusName:    store.Get().EventBusName,
 		TriggerURL:      cfConfig.GetCurrentContext().URL + store.Get().EventReportingEndpoint,
-		Triggers:        []string{trigger},
+		Triggers:        triggers,
 		TriggerDestKey:  dataKey,
 	})
 	return repofs.WriteYamls(repofs.Join(path, "sensor.yaml"), sensor)

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.235/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.236/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,11 +36,11 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.235/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.236/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf
 
 # check the installation
 cf version
-```
+```

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
     namespace: '{{ namespace }}'
 spec:
   defVersion: 1.0.0
-  version: 0.0.235
+  version: 0.0.236
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/store/store.go

@@ -121,9 +121,8 @@ type Store struct {
 	MinimumMemorySizeRequired            string
 	MinimumCpuRequired                   string
 	MinimumLocalDiskSizeRequired         string
-	ReplicaSetReporterName               string
-	ReplicaSetReporterServiceAccount     string
 	ReplicaSetResourceName               string
+	AnalysisRunResourceName              string
 	WorkflowResourceName                 string
 	RequirementsLink                     string
 	DownloadCliLink                      string
@@ -212,14 +211,13 @@ func init() {
 	s.GithubAccessTokenSecretObjectName = "autopilot-secret"
 	s.GithubAccessTokenSecretKey = "git_token"
 	s.ArgoCD = "argo-cd"
+	s.RolloutResourceName = "rollouts"
+	s.ReplicaSetResourceName = "replicasets"
+	s.AnalysisRunResourceName = "analysisruns"
 	s.MinimumMemorySizeRequired = "5000"
 	s.MinimumCpuRequired = "2"
-	s.ReplicaSetReporterName = "replicaset-reporter"
-	s.ReplicaSetReporterServiceAccount = "replicaset-reporter-sa"
-	s.ReplicaSetResourceName = "replicasets"
 	s.WorkflowResourceName = "workflows"
 	s.RolloutReporterName = "rollout-reporter"
-	s.RolloutResourceName = "rollouts"
 	s.RolloutReporterServiceAccount = "rollout-reporter-sa"
 	s.SegmentWriteKey = segmentWriteKey
 	s.RequirementsLink = "https://codefresh.io/csdp-docs/docs/runtime/requirements/"

pkg/util/events/util.go

@@ -161,8 +161,8 @@ func CreateResourceEventSource(opts *CreateResourceEventSourceOptions) *eventsou
 			eventsourcev1alpha1.DELETE,
 		},
 		GroupVersionResource: metav1.GroupVersionResource{
-			Group:    opts.Group,   //"argoproj.io",
-			Version:  opts.Version, //"v1alpha1",
+			Group:    opts.Group,
+			Version:  opts.Version,
 			Resource: opts.Resource,
 		},
 		Namespace: opts.Namespace,