fix:added layer info in packages (#1248)

* added layer info in packages * fixed unit cases
aquasecurity · Sep 22, 2021 · 8d13234 · 8d13234
1 parent 982f35b
commit 8d13234
Show file tree

Hide file tree

Showing 5 changed files with 188 additions and 141 deletions.
diff --git a/pkg/rpc/convert.go b/pkg/rpc/convert.go
@@ -32,6 +32,7 @@ func ConvertToRPCPkgs(pkgs []ftypes.Package) []*common.Package {
 			SrcRelease: pkg.SrcRelease,
 			SrcEpoch:   int32(pkg.SrcEpoch),
 			License:    pkg.License,
+			Layer:      ConvertToRPCLayer(pkg.Layer),
 		})
 	}
 	return rpcPkgs
@@ -52,6 +53,7 @@ func ConvertFromRPCPkgs(rpcPkgs []*common.Package) []ftypes.Package {
 			SrcRelease: pkg.SrcRelease,
 			SrcEpoch:   int(pkg.SrcEpoch),
 			License:    pkg.License,
+			Layer:      ConvertFromRPCLayer(pkg.Layer),
 		})
 	}
 	return pkgs

diff --git a/pkg/rpc/convert_test.go b/pkg/rpc/convert_test.go
@@ -41,6 +41,10 @@ func TestConvertToRpcPkgs(t *testing.T) {
 						SrcRelease: "1",
 						SrcEpoch:   2,
 						License:    "MIT",
+						Layer: ftypes.Layer{
+							Digest: "sha256:6a428f9f83b0a29f1fdd2ccccca19a9bab805a925b8eddf432a5a3d3da04afbc",
+							DiffID: "sha256:39982b2a789afc156fff00c707d0ff1c6ab4af8f1666a8df4787714059ce24e7",
+						},
 					},
 				},
 			},
@@ -56,6 +60,10 @@ func TestConvertToRpcPkgs(t *testing.T) {
 					SrcRelease: "1",
 					SrcEpoch:   2,
 					License:    "MIT",
+					Layer: &common.Layer{
+						Digest: "sha256:6a428f9f83b0a29f1fdd2ccccca19a9bab805a925b8eddf432a5a3d3da04afbc",
+						DiffId: "sha256:39982b2a789afc156fff00c707d0ff1c6ab4af8f1666a8df4787714059ce24e7",
+					},
 				},
 			},
 		},
@@ -91,6 +99,10 @@ func TestConvertFromRpcPkgs(t *testing.T) {
 						SrcRelease: "1",
 						SrcEpoch:   2,
 						License:    "MIT",
+						Layer: &common.Layer{
+							Digest: "sha256:6a428f9f83b0a29f1fdd2ccccca19a9bab805a925b8eddf432a5a3d3da04afbc",
+							DiffId: "sha256:39982b2a789afc156fff00c707d0ff1c6ab4af8f1666a8df4787714059ce24e7",
+						},
 					},
 				},
 			},
@@ -106,6 +118,10 @@ func TestConvertFromRpcPkgs(t *testing.T) {
 					SrcRelease: "1",
 					SrcEpoch:   2,
 					License:    "MIT",
+					Layer: ftypes.Layer{
+						Digest: "sha256:6a428f9f83b0a29f1fdd2ccccca19a9bab805a925b8eddf432a5a3d3da04afbc",
+						DiffID: "sha256:39982b2a789afc156fff00c707d0ff1c6ab4af8f1666a8df4787714059ce24e7",
+					},
 				},
 			},
 		},

diff --git a/pkg/rpc/server/server_test.go b/pkg/rpc/server/server_test.go
@@ -310,6 +310,10 @@ func TestCacheServer_PutBlob(t *testing.T) {
 										SrcVersion: "1.2.3",
 										SrcRelease: "1",
 										SrcEpoch:   2,
+										Layer: &common.Layer{
+											Digest: "sha256:154ad0735c360b212b167f424d33a62305770a1fcfb6363882f5c436cfbd9812",
+											DiffId: "sha256:b2a1a2d80bf0c747a4f6b0ca6af5eef23f043fcdb1ed4f3a3e750aef2dc68079",
+										},
 									},
 									{
 										Name:       "vim-minimal",
@@ -321,6 +325,10 @@ func TestCacheServer_PutBlob(t *testing.T) {
 										SrcVersion: "7.4.160",
 										SrcRelease: "5.el7",
 										SrcEpoch:   2,
+										Layer: &common.Layer{
+											Digest: "sha256:154ad0735c360b212b167f424d33a62305770a1fcfb6363882f5c436cfbd9812",
+											DiffId: "sha256:b2a1a2d80bf0c747a4f6b0ca6af5eef23f043fcdb1ed4f3a3e750aef2dc68079",
+										},
 									},
 								},
 							},
@@ -371,6 +379,10 @@ func TestCacheServer_PutBlob(t *testing.T) {
 										SrcVersion: "1.2.3",
 										SrcRelease: "1",
 										SrcEpoch:   2,
+										Layer: ftypes.Layer{
+											Digest: "sha256:154ad0735c360b212b167f424d33a62305770a1fcfb6363882f5c436cfbd9812",
+											DiffID: "sha256:b2a1a2d80bf0c747a4f6b0ca6af5eef23f043fcdb1ed4f3a3e750aef2dc68079",
+										},
 									},
 									{
 										Name:       "vim-minimal",
@@ -382,6 +394,10 @@ func TestCacheServer_PutBlob(t *testing.T) {
 										SrcVersion: "7.4.160",
 										SrcRelease: "5.el7",
 										SrcEpoch:   2,
+										Layer: ftypes.Layer{
+											Digest: "sha256:154ad0735c360b212b167f424d33a62305770a1fcfb6363882f5c436cfbd9812",
+											DiffID: "sha256:b2a1a2d80bf0c747a4f6b0ca6af5eef23f043fcdb1ed4f3a3e750aef2dc68079",
+										},
 									},
 								},
 							},