Merge pull request #667 from safedep/fix/bitbucket-report-misc

fix: bitbucket report mise issues

Author: KunalSin9h

pkg/reporter/bitbucket/bitbucket_annotations.go

@@ -47,7 +47,7 @@ func newBitBucketAnnotationForPackage(pkg *models.Package) []*CodeInsightsAnnota
 	if malwareInfo.IsMalware {
 		annotations = append(annotations, &CodeInsightsAnnotation{
 			Title:          fmt.Sprintf("Malware Package %s@%s", pkg.Name, pkg.Version),
-			AnnotationType: AnnotationTypeBug,
+			AnnotationType: AnnotationTypeCodeSmell,
 			Summary:        fmt.Sprintf("Package %s@%s is malicious", pkg.Name, pkg.Version),
 			Severity:       AnnotationSeverityCritical,
 			FilePath:       packagePath,
@@ -75,15 +75,21 @@ func newBitBucketAnnotationForAnalyzerEvent(event *analyzer.AnalyzerEvent) *Code
 
 	title := event.Filter.GetSummary()
 	if title == "" {
-		title = "Filter Matched"
+		title = fmt.Sprintf("Filter %s matched for %s@%s", event.Filter.Name, event.Package.Name, event.Package.Version)
+	}
+
+	summary := event.Filter.GetDescription()
+	if summary == "" {
+		summary = fmt.Sprintf("Source: %s", event.Source)
 	}
 
 	return &CodeInsightsAnnotation{
 		Title:          title,
-		AnnotationType: AnnotationTypeBug,
-		Summary:        event.Filter.GetDescription(),
+		AnnotationType: AnnotationTypeCodeSmell,
+		Summary:        summary,
 		Severity:       AnnotationSeverityMedium, // Default severity for policy violations
 		FilePath:       event.Package.Manifest.Source.Path,
+		ExternalID:     utils.NewUniqueId(),
 	}
 }
 

pkg/reporter/bitbucket/bitbucket_models.go

@@ -9,19 +9,15 @@ const (
 	ReportTypeSecurity ReportType = "SECURITY"
 	ReportTypeCoverage ReportType = "COVERAGE"
 	ReportTypeTest     ReportType = "TEST"
-	ReportTypeBug      ReportType = "BUG"
 )
 
-// ReportResult represents the pass/fail status of the report.
 type ReportResult string
 
 const (
-	ReportResultPassed  ReportResult = "PASSED"
-	ReportResultFailed  ReportResult = "FAILED"
-	ReportResultPending ReportResult = "PENDING"
+	ReportResultPassed ReportResult = "PASSED"
+	ReportResultFailed ReportResult = "FAILED"
 )
 
-// DataType represents the type of value in the report data fields.
 type DataType string
 
 const (
@@ -31,19 +27,17 @@ const (
 	DataTypeLink       DataType = "LINK"
 	DataTypeNumber     DataType = "NUMBER"
 	DataTypePercentage DataType = "PERCENTAGE"
+	DataTypeString     DataType = "STRING"
 	DataTypeText       DataType = "TEXT"
 )
 
-// AnnotationType represents the category of the annotation.
 type AnnotationType string
 
 const (
 	AnnotationTypeVulnerability AnnotationType = "VULNERABILITY"
 	AnnotationTypeCodeSmell     AnnotationType = "CODE_SMELL"
-	AnnotationTypeBug           AnnotationType = "BUG"
 )
 
-// AnnotationSeverity represents the severity level of the annotation.
 type AnnotationSeverity string
 
 const (
@@ -60,7 +54,7 @@ type CodeInsightsReport struct {
 	Reporter   string              `json:"reporter,omitempty"`
 	Link       string              `json:"link,omitempty"`
 	Result     ReportResult        `json:"result,omitempty"`
-	Data       []*CodeInsightsData `json:"data,omitempty"`
+	Data       []*CodeInsightsData `json:"data,omitempty"` // Max 10 elements
 }
 
 type CodeInsightsData struct {
@@ -70,12 +64,12 @@ type CodeInsightsData struct {
 }
 
 type CodeInsightsAnnotation struct {
-	Title          string             `json:"title"`
+	ExternalID     string             `json:"external_id,omitempty"` // Unique ID from your system
+	Title          string             `json:"title,omitempty"`
 	AnnotationType AnnotationType     `json:"annotation_type"`
 	Summary        string             `json:"summary"`
-	Severity       AnnotationSeverity `json:"severity"`
+	Severity       AnnotationSeverity `json:"severity,omitempty"`
 	FilePath       string             `json:"path,omitempty"`
-	LineNumber     uint32             `json:"line,omitempty"`
+	LineNumber     int                `json:"line,omitempty"`
 	Link           string             `json:"link,omitempty"`
-	ExternalID     string             `json:"external_id,omitempty"`
 }