Merge remote-tracking branch 'upstream/master' into support-gost-ubuntu

models/scanresults.go

@@ -291,12 +291,11 @@ func (r ScanResult) IsContainer() bool {
 }
 
 // RemoveRaspbianPackFromResult is for Raspberry Pi and removes the Raspberry Pi dedicated package from ScanResult.
-func (r ScanResult) RemoveRaspbianPackFromResult() ScanResult {
+func (r ScanResult) RemoveRaspbianPackFromResult() *ScanResult {
 	if r.Family != constant.Raspbian {
-		return r
+		return &r
 	}
 
-	result := r
 	packs := make(Packages)
 	for _, pack := range r.Packages {
 		if !IsRaspbianPackage(pack.Name, pack.Version) {
@@ -311,10 +310,10 @@ func (r ScanResult) RemoveRaspbianPackFromResult() ScanResult {
 		}
 	}
 
-	result.Packages = packs
-	result.SrcPackages = srcPacks
+	r.Packages = packs
+	r.SrcPackages = srcPacks
 
-	return result
+	return &r
 }
 
 // ClearFields clears a given fields of ScanResult

models/scanresults_test.go

@@ -94,6 +94,55 @@ func TestIsDisplayUpdatableNum(t *testing.T) {
 	}
 }
 
+func TestRemoveRaspbianPackFromResult(t *testing.T) {
+	var tests = []struct {
+		in       ScanResult
+		expected ScanResult
+	}{
+		{
+			in: ScanResult{
+				Family: constant.Raspbian,
+				Packages: Packages{
+					"apt":                Package{Name: "apt", Version: "1.8.2.1"},
+					"libraspberrypi-dev": Package{Name: "libraspberrypi-dev", Version: "1.20200811-1"},
+				},
+				SrcPackages: SrcPackages{},
+			},
+			expected: ScanResult{
+				Family: constant.Raspbian,
+				Packages: Packages{
+					"apt": Package{Name: "apt", Version: "1.8.2.1"},
+				},
+				SrcPackages: SrcPackages{},
+			},
+		},
+		{
+			in: ScanResult{
+				Family: constant.Debian,
+				Packages: Packages{
+					"apt": Package{Name: "apt", Version: "1.8.2.1"},
+				},
+				SrcPackages: SrcPackages{},
+			},
+			expected: ScanResult{
+				Family: constant.Debian,
+				Packages: Packages{
+					"apt": Package{Name: "apt", Version: "1.8.2.1"},
+				},
+				SrcPackages: SrcPackages{},
+			},
+		},
+	}
+
+	for i, tt := range tests {
+		r := tt.in
+		r = *r.RemoveRaspbianPackFromResult()
+		if !reflect.DeepEqual(r, tt.expected) {
+			t.Errorf("[%d] expected %+v, actual %+v", i, tt.expected, r)
+		}
+	}
+}
+
 func TestScanResult_Sort(t *testing.T) {
 	type fields struct {
 		Packages    Packages