Minor fixes.

gailazar300 · gailazar300 · commit fdb505145e8d · 2024-03-31T14:16:46.000+03:00
diff --git a/commands/audit/jas/common.go b/commands/audit/jas/common.go
@@ -285,7 +285,7 @@ func SetAnalyticsMetricsDataForAnalyzerManager(technologies []coreutils.Technolo
 	if err != nil {
 		log.Debug(fmt.Sprintf("failed setting AM_PACKAGE_MANAGER as environment variable. Cause: %s", err.Error()))
 	}
-	err = os.Setenv("AM_LANGUAGE", coreutils.TechnologyToLanguage(technology))
+	err = os.Setenv("AM_LANGUAGE", string(coreutils.TechnologyToLanguage(technology)))
 	if err != nil {
 		log.Debug(fmt.Sprintf("failed setting AM_LANGUAGE as environment variable. Cause: %s", err.Error()))
 	}
diff --git a/jfrogclisecurity_test.go b/jfrogclisecurity_test.go
@@ -40,7 +40,6 @@ func setupIntegrationTests() {
 	// Init
 	utils.InitTestCliDetails()
 	utils.AuthenticateArtifactory()
-	utils.AuthenticateXsc()
 	utils.CreateRequiredRepositories()
 }
 
diff --git a/utils/analyticsmetrics.go b/utils/analyticsmetrics.go
@@ -139,7 +139,7 @@ func (ams *AnalyticsMetricsService) UpdateGeneralEvent(auditResults *Results) {
 }
 
 func (ams *AnalyticsMetricsService) createAuditResultsFromXscAnalyticsBasicGeneralEvent(auditResults *Results) xscservices.XscAnalyticsBasicGeneralEvent {
-	totalDuration := time.Now().Sub(ams.GetStartTime())
+	totalDuration := time.Since(ams.GetStartTime())
 	totalFindings := len(auditResults.ScaResults)
 	if auditResults.ExtendedScanResults != nil {
 		totalFindings += len(auditResults.ExtendedScanResults.ApplicabilityScanResults) + len(auditResults.ExtendedScanResults.SecretsScanResults) + len(auditResults.ExtendedScanResults.IacScanResults) + len(auditResults.ExtendedScanResults.SastScanResults)

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ func SetAnalyticsMetricsDataForAnalyzerManager(technologies []coreutils.Technolo`
`285`	`285`	`if err != nil {`
`286`	`286`	`log.Debug(fmt.Sprintf("failed setting AM_PACKAGE_MANAGER as environment variable. Cause: %s", err.Error()))`
`287`	`287`	`}`
`288`		`- err = os.Setenv("AM_LANGUAGE", coreutils.TechnologyToLanguage(technology))`
	`288`	`+ err = os.Setenv("AM_LANGUAGE", string(coreutils.TechnologyToLanguage(technology)))`
`289`	`289`	`if err != nil {`
`290`	`290`	`log.Debug(fmt.Sprintf("failed setting AM_LANGUAGE as environment variable. Cause: %s", err.Error()))`
`291`	`291`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ func setupIntegrationTests() {`
`40`	`40`	`// Init`
`41`	`41`	`utils.InitTestCliDetails()`
`42`	`42`	`utils.AuthenticateArtifactory()`
`43`		`- utils.AuthenticateXsc()`
`44`	`43`	`utils.CreateRequiredRepositories()`
`45`	`44`	`}`
`46`	`45`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func (ams AnalyticsMetricsService) UpdateGeneralEvent(auditResults Results) {`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`func (ams AnalyticsMetricsService) createAuditResultsFromXscAnalyticsBasicGeneralEvent(auditResults Results) xscservices.XscAnalyticsBasicGeneralEvent {`
`142`		`- totalDuration := time.Now().Sub(ams.GetStartTime())`
	`142`	`+ totalDuration := time.Since(ams.GetStartTime())`
`143`	`143`	`totalFindings := len(auditResults.ScaResults)`
`144`	`144`	`if auditResults.ExtendedScanResults != nil {`
`145`	`145`	`totalFindings += len(auditResults.ExtendedScanResults.ApplicabilityScanResults) + len(auditResults.ExtendedScanResults.SecretsScanResults) + len(auditResults.ExtendedScanResults.IacScanResults) + len(auditResults.ExtendedScanResults.SastScanResults)`