Testing presubmit checks for when the go_proto is not updated.

PiperOrigin-RevId: 641242067
google · Jun 7, 2024 · 0c5f5ec · 0c5f5ec
1 parent 6f5766c
commit 0c5f5ec
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/binary/cli/cli_test.go b/binary/cli/cli_test.go
@@ -353,15 +353,15 @@ func TestWriteScanResults(t *testing.T) {
 				ResultFile: filepath.Join(testDirPath, "result.textproto"),
 			},
 			wantFilename:      "result.textproto",
-			wantContentPrefix: "version:",
+			wantContentPrefix: "scanner_version:",
 		},
 		{
 			desc: "Create proto using --output flag",
 			flags: &cli.Flags{
 				Output: []string{"textproto=" + filepath.Join(testDirPath, "result2.textproto")},
 			},
 			wantFilename:      "result2.textproto",
-			wantContentPrefix: "version:",
+			wantContentPrefix: "scanner_version:",
 		},
 		{
 			desc: "Create SPDX 2.3",

diff --git a/binary/proto/proto.go b/binary/proto/proto.go
@@ -166,13 +166,13 @@ func ScanResultToProto(r *scalibr.ScanResult) (*spb.ScanResult, error) {
 	}
 
 	return &spb.ScanResult{
-		Version:      r.Version,
-		StartTime:    timestamppb.New(r.StartTime),
-		EndTime:      timestamppb.New(r.EndTime),
-		Status:       scanStatusToProto(r.Status),
-		PluginStatus: pluginStatus,
-		Inventories:  inventories,
-		Findings:     findings,
+		ScannerVersion: r.Version,
+		StartTime:      timestamppb.New(r.StartTime),
+		EndTime:        timestamppb.New(r.EndTime),
+		Status:         scanStatusToProto(r.Status),
+		PluginStatus:   pluginStatus,
+		Inventories:    inventories,
+		Findings:       findings,
 	}, nil
 }
 

diff --git a/binary/proto/proto_test.go b/binary/proto/proto_test.go
@@ -42,7 +42,7 @@ import (
 
 func TestWrite(t *testing.T) {
 	testDirPath := t.TempDir()
-	var result = &spb.ScanResult{Version: "1.0.0"}
+	var result = &spb.ScanResult{ScannerVersion: "1.0.0"}
 	testCases := []struct {
 		desc           string
 		path           string
@@ -51,7 +51,7 @@ func TestWrite(t *testing.T) {
 		{
 			desc:           "textproto",
 			path:           "output.textproto",
-			expectedPrefix: "version:",
+			expectedPrefix: "scanner_version:",
 		},
 		{
 			desc:           "binproto",
@@ -104,7 +104,7 @@ func TestWrite_InvalidFilename(t *testing.T) {
 
 func TestWriteWithFormat(t *testing.T) {
 	testDirPath := t.TempDir()
-	var result = &spb.ScanResult{Version: "1.0.0"}
+	var result = &spb.ScanResult{ScannerVersion: "1.0.0"}
 	testCases := []struct {
 		desc           string
 		format         string
@@ -113,7 +113,7 @@ func TestWriteWithFormat(t *testing.T) {
 		{
 			desc:           "textproto",
 			format:         "textproto",
-			expectedPrefix: "version:",
+			expectedPrefix: "scanner_version:",
 		},
 		{
 			desc:           "binproto",
@@ -381,10 +381,10 @@ func TestScanResultToProto(t *testing.T) {
 				},
 			},
 			want: &spb.ScanResult{
-				Version:   "1.0.0",
-				StartTime: timestamppb.New(startTime),
-				EndTime:   timestamppb.New(endTime),
-				Status:    successProto,
+				ScannerVersion: "1.0.0",
+				StartTime:      timestamppb.New(startTime),
+				EndTime:        timestamppb.New(endTime),
+				Status:         successProto,
 				PluginStatus: []*spb.PluginStatus{
 					&spb.PluginStatus{
 						Name:    "ext",
@@ -441,10 +441,10 @@ func TestScanResultToProto(t *testing.T) {
 				Inventories: []*extractor.Inventory{purlRPMInventory},
 			},
 			want: &spb.ScanResult{
-				Version:   "1.0.0",
-				StartTime: timestamppb.New(startTime),
-				EndTime:   timestamppb.New(endTime),
-				Status:    successProto,
+				ScannerVersion: "1.0.0",
+				StartTime:      timestamppb.New(startTime),
+				EndTime:        timestamppb.New(endTime),
+				Status:         successProto,
 				PluginStatus: []*spb.PluginStatus{
 					&spb.PluginStatus{
 						Name:    "ext",
@@ -499,10 +499,10 @@ func TestScanResultToProto(t *testing.T) {
 				},
 			},
 			want: &spb.ScanResult{
-				Version:   "1.0.0",
-				StartTime: timestamppb.New(startTime),
-				EndTime:   timestamppb.New(endTime),
-				Status:    successProto,
+				ScannerVersion: "1.0.0",
+				StartTime:      timestamppb.New(startTime),
+				EndTime:        timestamppb.New(endTime),
+				Status:         successProto,
 				PluginStatus: []*spb.PluginStatus{
 					&spb.PluginStatus{
 						Name:    "ext",
@@ -626,10 +626,10 @@ func TestScanResultToProto(t *testing.T) {
 				},
 			},
 			want: &spb.ScanResult{
-				Version:   "1.0.0",
-				StartTime: timestamppb.New(startTime),
-				EndTime:   timestamppb.New(endTime),
-				Status:    failureProto,
+				ScannerVersion: "1.0.0",
+				StartTime:      timestamppb.New(startTime),
+				EndTime:        timestamppb.New(endTime),
+				Status:         failureProto,
 				PluginStatus: []*spb.PluginStatus{
 					&spb.PluginStatus{
 						Name:    "ext",

diff --git a/binary/proto/scan_result.proto b/binary/proto/scan_result.proto
@@ -29,7 +29,7 @@ option java_multiple_files = true;
 
 // The software inventory and security findings that a scan run found.
 message ScanResult {
-  string version = 1;
+  string scanner_version = 1;
   google.protobuf.Timestamp start_time = 2;
   google.protobuf.Timestamp end_time = 3;
   // Status of the overall scan.