@@ -21,35 +21,45 @@ func TestClient_NeedsUpdate(t *testing.T) {
2121 timeNextUpdateDay2 := time .Date (2019 , 10 , 2 , 0 , 0 , 0 , 0 , time .UTC )
2222
2323 tests := []struct {
24- name string
25- skip bool
26- metadata metadata.Metadata
27- want bool
28- wantErr string
24+ name string
25+ skip bool
26+ dbFileExists bool
27+ metadata metadata.Metadata
28+ want bool
29+ wantErr string
2930 }{
3031 {
31- name : "happy path" ,
32+ name : "happy path" ,
33+ dbFileExists : true ,
3234 metadata : metadata.Metadata {
3335 Version : db .SchemaVersion ,
3436 NextUpdate : timeNextUpdateDay1 ,
3537 },
3638 want : true ,
3739 },
3840 {
39- name : "happy path for first run" ,
40- metadata : metadata.Metadata {},
41- want : true ,
41+ name : "happy path for first run" ,
42+ dbFileExists : true ,
43+ metadata : metadata.Metadata {},
44+ want : true ,
4245 },
4346 {
44- name : "happy path with old schema version" ,
47+ name : "happy path for first run without trivy.db" ,
48+ dbFileExists : false ,
49+ want : true ,
50+ },
51+ {
52+ name : "happy path with old schema version" ,
53+ dbFileExists : true ,
4554 metadata : metadata.Metadata {
4655 Version : 0 ,
4756 NextUpdate : timeNextUpdateDay1 ,
4857 },
4958 want : true ,
5059 },
5160 {
52- name : "happy path with --skip-update" ,
61+ name : "happy path with --skip-update" ,
62+ dbFileExists : true ,
5363 metadata : metadata.Metadata {
5464 Version : db .SchemaVersion ,
5565 NextUpdate : timeNextUpdateDay1 ,
@@ -58,15 +68,17 @@ func TestClient_NeedsUpdate(t *testing.T) {
5868 want : false ,
5969 },
6070 {
61- name : "skip downloading DB" ,
71+ name : "skip downloading DB" ,
72+ dbFileExists : true ,
6273 metadata : metadata.Metadata {
6374 Version : db .SchemaVersion ,
6475 NextUpdate : timeNextUpdateDay2 ,
6576 },
6677 want : false ,
6778 },
6879 {
69- name : "newer schema version" ,
80+ name : "newer schema version" ,
81+ dbFileExists : true ,
7082 metadata : metadata.Metadata {
7183 Version : db .SchemaVersion + 1 ,
7284 NextUpdate : timeNextUpdateDay2 ,
@@ -75,13 +87,21 @@ func TestClient_NeedsUpdate(t *testing.T) {
7587 db .SchemaVersion + 1 , db .SchemaVersion ),
7688 },
7789 {
78- name : "--skip-update on the first run" ,
79- metadata : metadata.Metadata {},
80- skip : true ,
81- wantErr : "--skip-update cannot be specified on the first run" ,
90+ name : "--skip-update without trivy.db on the first run" ,
91+ dbFileExists : false ,
92+ skip : true ,
93+ wantErr : "--skip-update cannot be specified on the first run" ,
94+ },
95+ {
96+ name : "--skip-update without metadata.json on the first run" ,
97+ dbFileExists : true ,
98+ metadata : metadata.Metadata {},
99+ skip : true ,
100+ wantErr : "--skip-update cannot be specified on the first run" ,
82101 },
83102 {
84- name : "--skip-update with different schema version" ,
103+ name : "--skip-update with different schema version" ,
104+ dbFileExists : true ,
85105 metadata : metadata.Metadata {
86106 Version : 0 ,
87107 NextUpdate : timeNextUpdateDay1 ,
@@ -91,7 +111,8 @@ func TestClient_NeedsUpdate(t *testing.T) {
91111 0 , db .SchemaVersion ),
92112 },
93113 {
94- name : "happy with old DownloadedAt" ,
114+ name : "happy with old DownloadedAt" ,
115+ dbFileExists : true ,
95116 metadata : metadata.Metadata {
96117 Version : db .SchemaVersion ,
97118 NextUpdate : timeNextUpdateDay1 ,
@@ -100,7 +121,8 @@ func TestClient_NeedsUpdate(t *testing.T) {
100121 want : true ,
101122 },
102123 {
103- name : "skip downloading DB with recent DownloadedAt" ,
124+ name : "skip downloading DB with recent DownloadedAt" ,
125+ dbFileExists : true ,
104126 metadata : metadata.Metadata {
105127 Version : db .SchemaVersion ,
106128 NextUpdate : timeNextUpdateDay1 ,
@@ -119,6 +141,11 @@ func TestClient_NeedsUpdate(t *testing.T) {
119141 require .NoError (t , err )
120142 }
121143
144+ if tt .dbFileExists {
145+ err := db .Init (dbDir )
146+ require .NoError (t , err )
147+ }
148+
122149 // Set a fake time
123150 ctx := clock .With (context .Background (), time .Date (2019 , 10 , 1 , 0 , 0 , 0 , 0 , time .UTC ))
124151
@@ -138,7 +165,6 @@ func TestClient_NeedsUpdate(t *testing.T) {
138165}
139166
140167func TestClient_Download (t * testing.T ) {
141-
142168 tests := []struct {
143169 name string
144170 input string
0 commit comments