@@ -99,12 +99,15 @@ test.serial(
9999
100100 const loggedMessages : LoggedMessage [ ] = [ ] ;
101101 await cleanupAndUploadDatabases (
102+ {
103+ logger : getRecordingLogger ( loggedMessages ) ,
104+ features : createFeatures ( [ ] ) ,
105+ } ,
102106 testRepoName ,
103107 getCodeQL ( ) ,
104108 getTestConfig ( tmpDir ) ,
105109 testApiDetails ,
106- createFeatures ( [ ] ) ,
107- getRecordingLogger ( loggedMessages ) ,
110+ "" ,
108111 ) ;
109112 checkExpectedLogMessages ( t , loggedMessages , [
110113 "Database upload disabled in workflow. Skipping upload." ,
@@ -128,15 +131,18 @@ test.serial(
128131
129132 const loggedMessages : LoggedMessage [ ] = [ ] ;
130133 await cleanupAndUploadDatabases (
134+ {
135+ logger : getRecordingLogger ( loggedMessages ) ,
136+ features : createFeatures ( [ ] ) ,
137+ } ,
131138 testRepoName ,
132139 getCodeQL ( ) ,
133140 {
134141 ...getTestConfig ( tmpDir ) ,
135142 analysisKinds : [ AnalysisKind . CodeQuality ] ,
136143 } ,
137144 testApiDetails ,
138- createFeatures ( [ ] ) ,
139- getRecordingLogger ( loggedMessages ) ,
145+ "" ,
140146 ) ;
141147 checkExpectedLogMessages ( t , loggedMessages , [
142148 "Not uploading database because 'analysis-kinds: code-scanning' is not enabled." ,
@@ -159,12 +165,15 @@ test.serial("Abort database upload if running against GHES", async (t) => {
159165
160166 const loggedMessages : LoggedMessage [ ] = [ ] ;
161167 await cleanupAndUploadDatabases (
168+ {
169+ logger : getRecordingLogger ( loggedMessages ) ,
170+ features : createFeatures ( [ ] ) ,
171+ } ,
162172 testRepoName ,
163173 getCodeQL ( ) ,
164174 config ,
165175 testApiDetails ,
166- createFeatures ( [ ] ) ,
167- getRecordingLogger ( loggedMessages ) ,
176+ "" ,
168177 ) ;
169178 checkExpectedLogMessages ( t , loggedMessages , [
170179 "Not running against github.com or GHEC-DR. Skipping upload." ,
@@ -185,12 +194,15 @@ test.serial(
185194
186195 const loggedMessages : LoggedMessage [ ] = [ ] ;
187196 await cleanupAndUploadDatabases (
197+ {
198+ logger : getRecordingLogger ( loggedMessages ) ,
199+ features : createFeatures ( [ ] ) ,
200+ } ,
188201 testRepoName ,
189202 getCodeQL ( ) ,
190203 getTestConfig ( tmpDir ) ,
191204 testApiDetails ,
192- createFeatures ( [ ] ) ,
193- getRecordingLogger ( loggedMessages ) ,
205+ "" ,
194206 ) ;
195207 checkExpectedLogMessages ( t , loggedMessages , [
196208 "Not analyzing default branch. Skipping upload." ,
@@ -214,12 +226,15 @@ test.serial(
214226
215227 const loggedMessages : LoggedMessage [ ] = [ ] ;
216228 await cleanupAndUploadDatabases (
229+ {
230+ logger : getRecordingLogger ( loggedMessages ) ,
231+ features : createFeatures ( [ ] ) ,
232+ } ,
217233 testRepoName ,
218234 getCodeQL ( ) ,
219235 getTestConfig ( tmpDir ) ,
220236 testApiDetails ,
221- createFeatures ( [ ] ) ,
222- getRecordingLogger ( loggedMessages ) ,
237+ "" ,
223238 ) ;
224239
225240 checkExpectedLogMessages ( t , loggedMessages , [
@@ -253,12 +268,15 @@ test.serial(
253268
254269 const loggedMessages : LoggedMessage [ ] = [ ] ;
255270 await cleanupAndUploadDatabases (
271+ {
272+ logger : getRecordingLogger ( loggedMessages ) ,
273+ features : createFeatures ( [ ] ) ,
274+ } ,
256275 testRepoName ,
257276 getCodeQL ( ) ,
258277 getTestConfig ( tmpDir ) ,
259278 testApiDetails ,
260- createFeatures ( [ ] ) ,
261- getRecordingLogger ( loggedMessages ) ,
279+ "" ,
262280 ) ;
263281
264282 checkExpectedLogMessages ( t , loggedMessages , [
@@ -290,12 +308,15 @@ test.serial("Successfully uploading a database to github.com", async (t) => {
290308
291309 const loggedMessages : LoggedMessage [ ] = [ ] ;
292310 await cleanupAndUploadDatabases (
311+ {
312+ logger : getRecordingLogger ( loggedMessages ) ,
313+ features : createFeatures ( [ ] ) ,
314+ } ,
293315 testRepoName ,
294316 getCodeQL ( ) ,
295317 getTestConfig ( tmpDir ) ,
296318 testApiDetails ,
297- createFeatures ( [ ] ) ,
298- getRecordingLogger ( loggedMessages ) ,
319+ "" ,
299320 ) ;
300321 checkExpectedLogMessages ( t , loggedMessages , [
301322 "Successfully uploaded database for javascript" ,
@@ -316,6 +337,10 @@ test.serial("Successfully uploading a database to GHEC-DR", async (t) => {
316337
317338 const loggedMessages : LoggedMessage [ ] = [ ] ;
318339 await cleanupAndUploadDatabases (
340+ {
341+ logger : getRecordingLogger ( loggedMessages ) ,
342+ features : createFeatures ( [ ] ) ,
343+ } ,
319344 testRepoName ,
320345 getCodeQL ( ) ,
321346 getTestConfig ( tmpDir ) ,
@@ -324,8 +349,7 @@ test.serial("Successfully uploading a database to GHEC-DR", async (t) => {
324349 url : "https://tenant.ghe.com" ,
325350 apiURL : undefined ,
326351 } ,
327- createFeatures ( [ ] ) ,
328- getRecordingLogger ( loggedMessages ) ,
352+ "" ,
329353 ) ;
330354 checkExpectedLogMessages ( t , loggedMessages , [
331355 "Successfully uploaded database for javascript" ,
@@ -377,12 +401,15 @@ test.serial(
377401
378402 const loggedMessages : LoggedMessage [ ] = [ ] ;
379403 const results = await cleanupAndUploadDatabases (
404+ {
405+ logger : getRecordingLogger ( loggedMessages ) ,
406+ features : createFeatures ( [ Feature . UploadOverlayDbToApi ] ) ,
407+ } ,
380408 testRepoName ,
381409 codeql ,
382410 config ,
383411 testApiDetails ,
384- createFeatures ( [ Feature . UploadOverlayDbToApi ] ) ,
385- getRecordingLogger ( loggedMessages ) ,
412+ "" ,
386413 ) ;
387414
388415 // The database should be cleaned up at the `overlay` level for the upload
@@ -422,12 +449,15 @@ test.serial(
422449 } ) ;
423450
424451 const results = await cleanupAndUploadDatabases (
452+ {
453+ logger : getRecordingLogger ( [ ] ) ,
454+ features : createFeatures ( [ Feature . UploadOverlayDbToApi ] ) ,
455+ } ,
425456 testRepoName ,
426457 codeql ,
427458 getTestConfig ( tmpDir ) ,
428459 testApiDetails ,
429- createFeatures ( [ Feature . UploadOverlayDbToApi ] ) ,
430- getRecordingLogger ( [ ] ) ,
460+ "" ,
431461 ) ;
432462
433463 // A regular upload is cleaned only once, at the `clear` level.
@@ -465,12 +495,15 @@ test.serial("Does not measure clear cleanup size in debug mode", async (t) => {
465495 config . debugMode = true ;
466496
467497 const results = await cleanupAndUploadDatabases (
498+ {
499+ logger : getRecordingLogger ( [ ] ) ,
500+ features : createFeatures ( [ Feature . UploadOverlayDbToApi ] ) ,
501+ } ,
468502 testRepoName ,
469503 codeql ,
470504 config ,
471505 testApiDetails ,
472- createFeatures ( [ Feature . UploadOverlayDbToApi ] ) ,
473- getRecordingLogger ( [ ] ) ,
506+ "" ,
474507 ) ;
475508
476509 // In debug mode we clean up at the `overlay` level for the upload but skip
@@ -510,12 +543,15 @@ test.serial(
510543 config . overlayDatabaseMode = OverlayDatabaseMode . OverlayBase ;
511544
512545 const results = await cleanupAndUploadDatabases (
546+ {
547+ logger : getRecordingLogger ( [ ] ) ,
548+ features : createFeatures ( [ Feature . UploadOverlayDbToApi ] ) ,
549+ } ,
513550 testRepoName ,
514551 codeql ,
515552 config ,
516553 testApiDetails ,
517- createFeatures ( [ Feature . UploadOverlayDbToApi ] ) ,
518- getRecordingLogger ( [ ] ) ,
554+ "" ,
519555 ) ;
520556
521557 // When the `clear` cleanup fails, no size is measured, so we should not
0 commit comments