Merge remote-tracking branch 'upstream/dev' into update_ftoggit_1_20_6

Author: attiasas

utils/xsc/analyticsmetrics.go

@@ -11,12 +11,13 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/usage"
-	"github.com/jfrog/jfrog-cli-security/jas"
-	"github.com/jfrog/jfrog-cli-security/utils/results"
-	"github.com/jfrog/jfrog-cli-security/utils/results/conversion"
 	clientutils "github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	xscservices "github.com/jfrog/jfrog-client-go/xsc/services"
+
+	"github.com/jfrog/jfrog-cli-security/jas"
+	"github.com/jfrog/jfrog-cli-security/utils/results"
+	"github.com/jfrog/jfrog-cli-security/utils/results/conversion"
 )
 
 func CreateAnalyticsEvent(product xscservices.ProductName, eventType xscservices.EventType, serviceDetails *config.ServerDetails) *xscservices.XscAnalyticsGeneralEvent {
@@ -117,6 +118,23 @@ func CreateFinalizedEvent(xrayVersion, multiScanId string, startTime time.Time,
 	}
 }
 
+func SendGitIntegrationEvent(serverDetails *config.ServerDetails, xrayVersion, projectKey, eventType, gitProvider, gitOwner, gitRepository, gitBranch, eventStatus, failureReason string) error {
+	xscService, err := CreateXscService(serverDetails, xray.WithScopedProjectKey(projectKey))
+	if err != nil {
+		return err
+	}
+	gitIntegrationEvent := xscservices.GitIntegrationEvent{
+		EventType:     eventType,
+		GitProvider:   gitProvider,
+		GitOwner:      gitOwner,
+		GitRepository: gitRepository,
+		GitBranch:     gitBranch,
+		EventStatus:   eventStatus,
+		FailureReason: failureReason,
+	}
+	return xscService.SendGitIntegrationEvent(gitIntegrationEvent, xrayVersion)
+}
+
 func checkVersionForGitRepoKeyAnalytics(xrayVersion string) bool {
 	// TODO: Private patch, remove when not needed anymore
 	if xrayVersion == "3.111.13" {