From 8f87ccefba796ed0001af3d7667ee5de4729cf86 Mon Sep 17 00:00:00 2001 From: Christopher Phillips Date: Mon, 10 Oct 2022 22:59:00 -0400 Subject: [PATCH] fix: update unit tests and snapshot images Signed-off-by: Christopher Phillips --- .../snapshot/TestDirectoryEncoder.golden | 1 + .../TestEncodeFullJSONDocument.golden | 1 + .../snapshot/TestImageEncoder.golden | 15 ++++++++------- .../stereoscope-fixture-image-simple.golden | Bin 15360 -> 15360 bytes syft/source/source_test.go | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/syft/formats/syftjson/test-fixtures/snapshot/TestDirectoryEncoder.golden b/syft/formats/syftjson/test-fixtures/snapshot/TestDirectoryEncoder.golden index 5b29cc7f13e..2a7e5e954a7 100644 --- a/syft/formats/syftjson/test-fixtures/snapshot/TestDirectoryEncoder.golden +++ b/syft/formats/syftjson/test-fixtures/snapshot/TestDirectoryEncoder.golden @@ -67,6 +67,7 @@ ], "artifactRelationships": [], "source": { + "id": "", "type": "directory", "target": "/some/path" }, diff --git a/syft/formats/syftjson/test-fixtures/snapshot/TestEncodeFullJSONDocument.golden b/syft/formats/syftjson/test-fixtures/snapshot/TestEncodeFullJSONDocument.golden index e07bbfbe7f1..c9c32c2ebd8 100644 --- a/syft/formats/syftjson/test-fixtures/snapshot/TestEncodeFullJSONDocument.golden +++ b/syft/formats/syftjson/test-fixtures/snapshot/TestEncodeFullJSONDocument.golden @@ -139,6 +139,7 @@ } ], "source": { + "id": "", "type": "image", "target": { "userInput": "user-image-input", diff --git a/syft/formats/syftjson/test-fixtures/snapshot/TestImageEncoder.golden b/syft/formats/syftjson/test-fixtures/snapshot/TestImageEncoder.golden index 7f3e655329f..13c8c90bbcc 100644 --- a/syft/formats/syftjson/test-fixtures/snapshot/TestImageEncoder.golden +++ b/syft/formats/syftjson/test-fixtures/snapshot/TestImageEncoder.golden @@ -9,7 +9,7 @@ "locations": [ { "path": "/somefile-1.txt", - "layerID": "sha256:7ef28e9c2d56471ee090b578a678bdf28c3b5a311ca7b2e28c2a4185e5bb34c0" + "layerID": "sha256:4965affaf42a7174561882c5fd87e2db6f0b07df532459ba86f98a8bd2af11de" } ], "licenses": [ @@ -40,7 +40,7 @@ "locations": [ { "path": "/somefile-2.txt", - "layerID": "sha256:86da8aee621161bea2efaf27a2709ddab5e7d44e30ecdfda728b02c03a28fd98" + "layerID": "sha256:460c3e27be163efe75df048c4d4cf3a22e7e363f02521fa2e82a3bd257a682d4" } ], "licenses": [], @@ -64,10 +64,11 @@ ], "artifactRelationships": [], "source": { + "id": "", "type": "image", "target": { "userInput": "user-image-input", - "imageID": "sha256:5dd5f5f4247e4e946f555f0de7681a631a5240b614e52717d0aed04808e8c65f", + "imageID": "sha256:6b1b476e6dc187bb688566606cf7a59d7804d81169967d8c6bb121627b0a387f", "manifestDigest": "sha256:2731251dc34951c0e50fcc643b4c5f74922dad1a5d98f302b504cf46cd5d9368", "mediaType": "application/vnd.docker.distribution.manifest.v2+json", "tags": [ @@ -77,17 +78,17 @@ "layers": [ { "mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip", - "digest": "sha256:7ef28e9c2d56471ee090b578a678bdf28c3b5a311ca7b2e28c2a4185e5bb34c0", + "digest": "sha256:4965affaf42a7174561882c5fd87e2db6f0b07df532459ba86f98a8bd2af11de", "size": 22 }, { "mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip", - "digest": "sha256:86da8aee621161bea2efaf27a2709ddab5e7d44e30ecdfda728b02c03a28fd98", + "digest": "sha256:460c3e27be163efe75df048c4d4cf3a22e7e363f02521fa2e82a3bd257a682d4", "size": 16 } ], - "manifest": "eyJzY2hlbWFWZXJzaW9uIjoyLCJtZWRpYVR5cGUiOiJhcHBsaWNhdGlvbi92bmQuZG9ja2VyLmRpc3RyaWJ1dGlvbi5tYW5pZmVzdC52Mitqc29uIiwiY29uZmlnIjp7Im1lZGlhVHlwZSI6ImFwcGxpY2F0aW9uL3ZuZC5kb2NrZXIuY29udGFpbmVyLmltYWdlLnYxK2pzb24iLCJzaXplIjo2NzMsImRpZ2VzdCI6InNoYTI1Njo1ZGQ1ZjVmNDI0N2U0ZTk0NmY1NTVmMGRlNzY4MWE2MzFhNTI0MGI2MTRlNTI3MTdkMGFlZDA0ODA4ZThjNjVmIn0sImxheWVycyI6W3sibWVkaWFUeXBlIjoiYXBwbGljYXRpb24vdm5kLmRvY2tlci5pbWFnZS5yb290ZnMuZGlmZi50YXIuZ3ppcCIsInNpemUiOjIwNDgsImRpZ2VzdCI6InNoYTI1Njo3ZWYyOGU5YzJkNTY0NzFlZTA5MGI1NzhhNjc4YmRmMjhjM2I1YTMxMWNhN2IyZTI4YzJhNDE4NWU1YmIzNGMwIn0seyJtZWRpYVR5cGUiOiJhcHBsaWNhdGlvbi92bmQuZG9ja2VyLmltYWdlLnJvb3Rmcy5kaWZmLnRhci5nemlwIiwic2l6ZSI6MjA0OCwiZGlnZXN0Ijoic2hhMjU2Ojg2ZGE4YWVlNjIxMTYxYmVhMmVmYWYyN2EyNzA5ZGRhYjVlN2Q0NGUzMGVjZGZkYTcyOGIwMmMwM2EyOGZkOTgifV19", - "config": "eyJhcmNoaXRlY3R1cmUiOiJhbWQ2NCIsImNvbmZpZyI6eyJFbnYiOlsiUEFUSD0vdXNyL2xvY2FsL3NiaW46L3Vzci9sb2NhbC9iaW46L3Vzci9zYmluOi91c3IvYmluOi9zYmluOi9iaW4iXSwiV29ya2luZ0RpciI6Ii8iLCJPbkJ1aWxkIjpudWxsfSwiY3JlYXRlZCI6IjIwMjItMDYtMDJUMTQ6MzQ6MzQuNzE5MTM1MTc0WiIsImhpc3RvcnkiOlt7ImNyZWF0ZWQiOiIyMDIyLTA2LTAyVDE0OjM0OjM0LjY4NjkzMzI2M1oiLCJjcmVhdGVkX2J5IjoiQUREIGZpbGUtMS50eHQgL3NvbWVmaWxlLTEudHh0ICMgYnVpbGRraXQiLCJjb21tZW50IjoiYnVpbGRraXQuZG9ja2VyZmlsZS52MCJ9LHsiY3JlYXRlZCI6IjIwMjItMDYtMDJUMTQ6MzQ6MzQuNzE5MTM1MTc0WiIsImNyZWF0ZWRfYnkiOiJBREQgZmlsZS0yLnR4dCAvc29tZWZpbGUtMi50eHQgIyBidWlsZGtpdCIsImNvbW1lbnQiOiJidWlsZGtpdC5kb2NrZXJmaWxlLnYwIn1dLCJvcyI6ImxpbnV4Iiwicm9vdGZzIjp7InR5cGUiOiJsYXllcnMiLCJkaWZmX2lkcyI6WyJzaGEyNTY6N2VmMjhlOWMyZDU2NDcxZWUwOTBiNTc4YTY3OGJkZjI4YzNiNWEzMTFjYTdiMmUyOGMyYTQxODVlNWJiMzRjMCIsInNoYTI1Njo4NmRhOGFlZTYyMTE2MWJlYTJlZmFmMjdhMjcwOWRkYWI1ZTdkNDRlMzBlY2RmZGE3MjhiMDJjMDNhMjhmZDk4Il19fQ==", + "manifest": "eyJzY2hlbWFWZXJzaW9uIjoyLCJtZWRpYVR5cGUiOiJhcHBsaWNhdGlvbi92bmQuZG9ja2VyLmRpc3RyaWJ1dGlvbi5tYW5pZmVzdC52Mitqc29uIiwiY29uZmlnIjp7Im1lZGlhVHlwZSI6ImFwcGxpY2F0aW9uL3ZuZC5kb2NrZXIuY29udGFpbmVyLmltYWdlLnYxK2pzb24iLCJzaXplIjo2NzMsImRpZ2VzdCI6InNoYTI1Njo2YjFiNDc2ZTZkYzE4N2JiNjg4NTY2NjA2Y2Y3YTU5ZDc4MDRkODExNjk5NjdkOGM2YmIxMjE2MjdiMGEzODdmIn0sImxheWVycyI6W3sibWVkaWFUeXBlIjoiYXBwbGljYXRpb24vdm5kLmRvY2tlci5pbWFnZS5yb290ZnMuZGlmZi50YXIuZ3ppcCIsInNpemUiOjIwNDgsImRpZ2VzdCI6InNoYTI1Njo0OTY1YWZmYWY0MmE3MTc0NTYxODgyYzVmZDg3ZTJkYjZmMGIwN2RmNTMyNDU5YmE4NmY5OGE4YmQyYWYxMWRlIn0seyJtZWRpYVR5cGUiOiJhcHBsaWNhdGlvbi92bmQuZG9ja2VyLmltYWdlLnJvb3Rmcy5kaWZmLnRhci5nemlwIiwic2l6ZSI6MjA0OCwiZGlnZXN0Ijoic2hhMjU2OjQ2MGMzZTI3YmUxNjNlZmU3NWRmMDQ4YzRkNGNmM2EyMmU3ZTM2M2YwMjUyMWZhMmU4MmEzYmQyNTdhNjgyZDQifV19", + "config": "eyJhcmNoaXRlY3R1cmUiOiJhbWQ2NCIsImNvbmZpZyI6eyJFbnYiOlsiUEFUSD0vdXNyL2xvY2FsL3NiaW46L3Vzci9sb2NhbC9iaW46L3Vzci9zYmluOi91c3IvYmluOi9zYmluOi9iaW4iXSwiV29ya2luZ0RpciI6Ii8iLCJPbkJ1aWxkIjpudWxsfSwiY3JlYXRlZCI6IjIwMjItMTAtMDVUMTQ6MjQ6NTguNzc0NTY2MjM2WiIsImhpc3RvcnkiOlt7ImNyZWF0ZWQiOiIyMDIyLTEwLTA1VDE0OjI0OjU4Ljc0NDY3NTEyOVoiLCJjcmVhdGVkX2J5IjoiQUREIGZpbGUtMS50eHQgL3NvbWVmaWxlLTEudHh0ICMgYnVpbGRraXQiLCJjb21tZW50IjoiYnVpbGRraXQuZG9ja2VyZmlsZS52MCJ9LHsiY3JlYXRlZCI6IjIwMjItMTAtMDVUMTQ6MjQ6NTguNzc0NTY2MjM2WiIsImNyZWF0ZWRfYnkiOiJBREQgZmlsZS0yLnR4dCAvc29tZWZpbGUtMi50eHQgIyBidWlsZGtpdCIsImNvbW1lbnQiOiJidWlsZGtpdC5kb2NrZXJmaWxlLnYwIn1dLCJvcyI6ImxpbnV4Iiwicm9vdGZzIjp7InR5cGUiOiJsYXllcnMiLCJkaWZmX2lkcyI6WyJzaGEyNTY6NDk2NWFmZmFmNDJhNzE3NDU2MTg4MmM1ZmQ4N2UyZGI2ZjBiMDdkZjUzMjQ1OWJhODZmOThhOGJkMmFmMTFkZSIsInNoYTI1Njo0NjBjM2UyN2JlMTYzZWZlNzVkZjA0OGM0ZDRjZjNhMjJlN2UzNjNmMDI1MjFmYTJlODJhM2JkMjU3YTY4MmQ0Il19fQ==", "repoDigests": [], "architecture": "", "os": "" diff --git a/syft/formats/syftjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden b/syft/formats/syftjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden index 3cd33e2b8f5017eba3b30fd98d7a456c3e4515d7..538b5e585a0b7b89ee121818721edf3752e24736 100644 GIT binary patch literal 15360 zcmeHOZExE)5ccQ&3Qzm$7n0(e4D3VJ1ZaU`8QQD^Rs;cG6D_u6NOF-N$ba8Sb`r;3 z;-s?ObfI9tq9`6u&xz#S=^@uxQ^6g#21}temy&VL5jS2amRKPXwGv~VBwSc&xYn3p zPJ~7(mckGIDf6uJ_<=A&oYD@OAFKbEP~5>Z#v+D(1nD4x7!sW>dR**gYG-Ao3Q(!7 zwAF`eD{n{buOd~Lv$S%iniVb@MQUO>je3#EGoPMDqpRp3`x1>lM}O=cz5R7KD~sVc zH)=dAb()Qq%D2V4issV12&d6;FZwGl&eQC4KP{lEA#`(?{WeR-HX3EK@%S3LEu5+x zlp}%&>0{JK>-LQr@+NzDI-re|qc<;5lFcD1eFQd$^R#LZnM_<(L93gK1Dl(3SJVv#Ur==2TdT;j{{O8A zSy5zOex@RTbY6m@<20LHfa*n_R~{~0Mb+iBw(?kAx}t;{n|gneTB!RRm1l}DKB5U{ z%6sK0Q3BT*V=0MY-b&$!)!ZYEg!L>YlqFh8?h~n`wnTZ1tplkyk~lK4gSo!#l+^$` zMI0f_v^3ff!eL6L#3~}aan`_M0BZ!5f-uiG8$JOzgeVe>t( z4fy|ztj_-!K}Zn%{~f#!S5aC!+ihP1@cE{yn0v=YC)#Uj2^L5>t+a675R-rt?h+}5 zjllu5-hjJ-h!zw{9V4YtEE)AmTafjPC;;M=N~M`APVOR>w|QA*YEnD8AZ$OMzzuih zKTB6fA5gPbRmz-wtSkg4Bd^A#Te_Cdz|~*9=n81MxOh}S1hF_joVx73oThY`8Bk(z zPZLMgVNNf4Gg(ADz3AOUoh}spl#gc<2d?=1rhBmxXnT-V#pN_l>kwpq$GzaG7rj^7 zjTg=9Q0g{7klZLqeb{I9?~!u}!uy9<Y2vFPUaDD!df0h4Z;rst~jIkoM0v27vfa{*A@-_{) za#JV<1Ofs9fq=mO4uOfvQt!&@DLnpfefV|jKV$JdE@=Jz4+H;mC(N{0&i@4N{F?<& zB;uRc3j&eg2RF@+)ajg4Ub({MrOBtR@6(HVlR-bNDKGspolM7WBpKq|FpMNH$Sn~R z_MOPYC5Z#taDqH+Mlm#Tf_QHd#sm_^a)+fyjsPiL*SiYd&)MuiVc%Rh1JAKJZUhk7 zkAM2s;j`6t1=y-gVIM{6%58PDZv2xwZg|55hw%@aJi_?jmOYl`UPa}a5nAsWX+20c Zz%abNewia^8O?AW5C{ka1b!R@{sr6MmP`Nu literal 15360 zcmeHOUvJws5YO{Ig~z?dHc9c1WMB_jQ=kQkrD(GbSWyHNc}%q0k|D`Of*{|0C)r6H zca7u7aZ{9n0h=Q4c)sINcR!w_bJ9yMxX>UV5z0#`J$0Z}%#4bdkzCMJF#(cmrX4ll zsEBC{u~pI!{;i69@BWK2N|g|MbbhUVGcMR3LkVya$u!@ioGLE%dh~v_+v%NEwJA}g zuH07tTvvWOqQ4}jv}aijww{$hM#M~<5@es)BKO%T8C{Z>`4=+!NZuYCzxsVRtIFZH zux320(kve>wQriY9qp}o6MvFV`{eJU{G8>dhgpeJ4RM;I{Et~Sc4U;##^WoTwggiH zwh5=4_o?bre$2!uYCZ$a5*Fba5&t0RSyt6Wd4aNBt|3#gN}`CXs3BX-aFQY=IXFD* z`D_e*HmJ|*-moeru+;vomp0OU&gxbplL_QCQeEF1xWayhvLP6Jq2y|RogjDQ|9?UF ziXij$hJv7`iwXrDXZh?LMK6n@_ITrx)ECpn%42f@WraO1^Zq1r*!PiCXNF5P(%^Xv ziRDfzp&0;8XexDVl#Ww}eKty^i5Rm+ryQ`&jbO0^nWmAj6uB-q#mbr304UCwVksC7 z-gvGJ*EDg?q!P3f0wN05d1o|_Q_3xk43E7_V)E(gYDa$Xvrgj@+{BYqaqGY)8m*aH zNky7)Zxic{ig~In1A`;9wOmOB*sYWk%1OqD4^SMXf@&#O_xJ0t=OLlLBsR^KAmo>j}1CUKHCx{@c9lJ= zRaA9uCQV3+EDnna4!CXqRY8*{V9!Ba8+-P?c9=$tyct)pbg!6UP`-K-N+ey}Jgza; zU;I9rLVlM|+d9fE3b7c|W;{(ovQJ)27P-kjc|9?w3qd~=$Lu8#ogiz{K@&=&A zBcP|k|M0{p;D5VVA)W32H25EjREYm~VgG>t?Ly1XcaF~f-yQ#Bl7Dsnqm>T+zl&9~ z!2h}~0|dRMrktOScZHOY*DaQ~whEw0Sp%xrVwEeX;tzqcZmF(hbC|X%KG_tf{YI(G zcZ6>{ZxLM`|7q}FrdbsB|IWsJ0D~L+x2-dJ0Kp@MtjB-n&;MooR|fk(Lera*w8d`x z2KfDTa}I$bXdq}HXdr0dN7TT?Uud>N>45L_5rL1H$ z#^Q3vweZ@+2_y+%*>FO=!d{Vp<{k@@rPNg8DFm?CQ{ddnw0W!G&Agf&OW3<&54Y(I z{*UeDMp(%H>6eY{va7)*+N#R%J&FvT?9_jq|MT10@MaHa{9mcy|2tU%m!w+bq0L(( eot<>l*_p`I)${bAotP<15;PDr5HzrL4g3cR`;g%P diff --git a/syft/source/source_test.go b/syft/source/source_test.go index 48c68fb847d..2ca8fc55d57 100644 --- a/syft/source/source_test.go +++ b/syft/source/source_test.go @@ -120,7 +120,7 @@ func TestSetID(t *testing.T) { Path: "test-fixtures/image-simple", }, }, - expected: artifact.ID("febd2d6148dc327d"), + expected: artifact.ID("841b3d20fb723404"), }, }