Merge branch 'release-2.12' of github.com:codefresh-io/argo-cd into CR-23668-multisource-details-reporting

# Conflicts:
#	event_reporter/reporter/application_event_reporter.go
#	event_reporter/reporter/event_payload.go
#	event_reporter/reporter/types.go

Author: oleksandr-codefresh

event_reporter/reporter/application_event_reporter.go

@@ -251,12 +251,10 @@ func (s *applicationEventReporter) StreamApplicationEvents(
 
 // returns appVersion from first non-ref source for multisourced apps
 func (s *applicationEventReporter) resolveApplicationVersions(ctx context.Context, a *appv1.Application, logCtx *log.Entry) *apiclient.ApplicationVersions {
-	var applicationVersions *apiclient.ApplicationVersions
-
 	if a.Spec.HasMultipleSources() {
 		syncResultRevisions := utils.GetOperationSyncResultRevisions(a)
 		if syncResultRevisions == nil {
-			return applicationVersions
+			return nil
 		}
 
 		var sourcePositions []int64
@@ -270,12 +268,12 @@ func (s *applicationEventReporter) resolveApplicationVersions(ctx context.Contex
 
 	syncResultRevision := utils.GetOperationSyncResultRevision(a)
 
-	if syncResultRevision != nil {
-		syncManifests, _ := s.getDesiredManifests(ctx, logCtx, a, syncResultRevision, nil, nil)
-		return syncManifests.GetApplicationVersions()
+	if syncResultRevision == nil {
+		return nil
 	}
 
-	return applicationVersions
+	syncManifests, _ := s.getDesiredManifests(ctx, logCtx, a, syncResultRevision, nil, nil)
+	return syncManifests.GetApplicationVersions()
 }
 
 func (s *applicationEventReporter) getAppForResourceReporting(

event_reporter/reporter/event_payload.go

@@ -208,12 +208,8 @@ func buildEventObjectAsLiveAndCompiledManifestsEmpty(
 ) ([]byte, error) {
 	// no actual or desired state, don't send event
 	u := &unstructured.Unstructured{}
-	apiVersion := rr.rs.Version
-	if rr.rs.Group != "" {
-		apiVersion = rr.rs.Group + "/" + rr.rs.Version
-	}
 
-	u.SetAPIVersion(apiVersion)
+	u.SetAPIVersion(rr.GetApiVersion())
 	u.SetKind(rr.rs.Kind)
 	u.SetName(rr.rs.Name)
 	u.SetNamespace(rr.rs.Namespace)

event_reporter/reporter/types.go

@@ -32,3 +32,12 @@ type ArgoTrackingMetadata struct {
 	AppInstanceLabelKey *string
 	TrackingMethod      *appv1.TrackingMethod
 }
+
+func (rr *ReportedResource) GetApiVersion() string {
+	apiVersion := rr.rs.Version
+	if rr.rs.Group != "" {
+		apiVersion = rr.rs.Group + "/" + rr.rs.Version
+	}
+
+	return apiVersion
+}