Bugfix: Close zip container before final progress write.

This ensures the hash is written in every case.

json/csv.go

@@ -58,7 +58,7 @@ func ConvertJSONL(
 
 		// In the special case where we do not need to modify the json
 		// or convert it to csv then we can skip parsing it
-		// alltogether.
+		// altogether.
 		if extra_data == nil && jsonl_out != nil && csv_out == nil {
 			jsonl_out.Write(serialized)
 			continue

reporting/progress.go

@@ -46,6 +46,9 @@ func (self *progressReporter) writeStats() {
 // If we call Close() before the timeout then the collection worked
 // fine - even when the context is cancelled.
 func (self *progressReporter) Close() {
+	// Write the stats one final time.
+	self.writeStats()
+
 	self.mu.Lock()
 	defer self.mu.Unlock()
 

vql/server/downloads/downloads.go

@@ -246,9 +246,6 @@ func createDownloadFile(
 	go func() {
 		defer wg.Done()
 
-		// Will also close the underlying container when done.
-		defer zip_writer.Close()
-
 		timeout := int64(600)
 		if config_obj.Defaults != nil &&
 			config_obj.Defaults.ExportMaxTimeoutSec > 0 {
@@ -265,6 +262,10 @@ func createDownloadFile(
 			download_file, zip_writer)
 		defer progress_reporter.Close()
 
+		// Will also close the underlying container when done. Must be
+		// done before progress close so we can write the hash.
+		defer zip_writer.Close()
+
 		err := downloadFlowToZip(ctx, scope, config_obj, format,
 			client_id, path_specs.NewUnsafeFilestorePath(),
 			flow_id, expand_sparse, zip_writer)
@@ -775,9 +776,6 @@ func createHuntDownloadFile(
 	go func() {
 		defer wg.Done()
 
-		// Will also close the underlying fd.
-		defer zip_writer.Close()
-
 		timeout := int64(3600)
 		if config_obj.Defaults != nil &&
 			config_obj.Defaults.ExportMaxTimeoutSec > 0 {
@@ -795,6 +793,10 @@ func createHuntDownloadFile(
 			download_file, zip_writer)
 		defer progress_reporter.Close()
 
+		// Will also close the underlying container when done. Must be
+		// done before progress close so we can write the hash.
+		defer zip_writer.Close()
+
 		err = zip_writer.WriteJSON(
 			paths.ZipPathFromFSPathSpec(path_specs.NewUnsafeFilestorePath().AddChild("hunt_info")),
 			hunt_details)