Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions go/internal/scanreport/packager.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ func PackageReport(data *ReportData) ([]byte, error) {
if err := addMetadata(zw, data.Metadata); err != nil {
return nil, err
}
if err := addAnalytics(zw); err != nil {
return nil, err
}
if err := addComponents(zw, data.RootComponent, data.FileComponents); err != nil {
return nil, err
}
Expand Down Expand Up @@ -81,6 +84,15 @@ func addMetadata(zw *zip.Writer, md *pb.Metadata) error {
return addProtoMessage(zw, "metadata.pb", md)
}

// addAnalytics writes analytics.pb, which the Compute Engine treats as
// mandatory (issue #478). We identify ourselves via ci_name so migrated
// analyses are distinguishable from real scanner runs.
func addAnalytics(zw *zip.Writer) error {
return addProtoMessage(zw, "analytics.pb", &pb.Analytics{
Property: map[string]string{"ci_name": "sonar-migration-tool"},
})
}

func addComponents(zw *zip.Writer, root *pb.Component, files []*pb.Component) error {
if err := addProtoMessage(zw, fmt.Sprintf("component-%d.pb", root.Ref), root); err != nil {
return err
Expand Down
1 change: 1 addition & 0 deletions go/internal/scanreport/packager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ func verifyZipStructure(t *testing.T, zipBytes []byte) {

expected := map[string]bool{
"metadata.pb": false,
"analytics.pb": false,
"component-1.pb": false,
"component-2.pb": false,
"activerules.pb": false,
Expand Down
Loading
Loading