Skip to content

Commit be111a8

Browse files
committed
fix lint
1 parent d5a9a9f commit be111a8

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

pkg/jobs/export_evidence.go

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package jobs
22

33
import (
4+
"archive/zip"
45
"bytes"
56
"context"
67
"encoding/json"
@@ -11,8 +12,6 @@ import (
1112
"strings"
1213
"time"
1314

14-
"archive/zip"
15-
1615
"github.com/99designs/gqlgen/graphql"
1716
"github.com/gqlgo/gqlgenc/clientv2"
1817
"github.com/riverqueue/river"
@@ -50,8 +49,8 @@ type evidenceMetadata struct {
5049
}
5150

5251
func (w *ExportContentWorker) exportEvidenceFiles(ctx context.Context,
53-
job *river.Job[jobspec.ExportContentArgs], export *graphclient.GetExportByID) error {
54-
52+
job *river.Job[jobspec.ExportContentArgs], export *graphclient.GetExportByID,
53+
) error {
5554
where, err := parseExportFilters(export)
5655
if err != nil {
5756
log.Error().Err(err).Msg("failed to parse export filters")
@@ -172,8 +171,8 @@ func parseExportFilters(export *graphclient.GetExportByID) (*graphclient.Evidenc
172171
}
173172

174173
func (w *ExportContentWorker) fetchEvidences(ctx context.Context, where *graphclient.EvidenceWhereInput,
175-
impersonation clientv2.RequestInterceptor) ([]*graphclient.GetEvidences_Evidences_Edges_Node, error) {
176-
174+
impersonation clientv2.RequestInterceptor,
175+
) ([]*graphclient.GetEvidences_Evidences_Edges_Node, error) {
177176
var (
178177
allEvidences []*graphclient.GetEvidences_Evidences_Edges_Node
179178
after *string
@@ -265,8 +264,8 @@ func foldersForEvidence(ev *graphclient.GetEvidences_Evidences_Edges_Node, mode
265264
}
266265

267266
func buildFileEntries(evidences []*graphclient.GetEvidences_Evidences_Edges_Node, fileDetails map[string]*graphclient.GetFileByID_File,
268-
mode enums.ExportMode, retainOriginalFileName bool) ([]evidenceFile, map[string][]evidenceMetadata) {
269-
267+
mode enums.ExportMode, retainOriginalFileName bool,
268+
) ([]evidenceFile, map[string][]evidenceMetadata) {
270269
usedNames := make(map[string]map[string]int)
271270

272271
// we need metadata.txt for folder exports
@@ -356,8 +355,8 @@ func buildFileEntries(evidences []*graphclient.GetEvidences_Evidences_Edges_Node
356355

357356
func (w *ExportContentWorker) createZipArchive(
358357
ctx context.Context, rootFolder string, files []evidenceFile, folders map[string][]evidenceMetadata,
359-
controls map[string]controlInfo, mode enums.ExportMode) ([]byte, error) {
360-
358+
controls map[string]controlInfo, mode enums.ExportMode,
359+
) ([]byte, error) {
361360
var buf bytes.Buffer
362361

363362
zw := zip.NewWriter(&buf)
@@ -366,7 +365,6 @@ func (w *ExportContentWorker) createZipArchive(
366365

367366
if mode == enums.ExportModeFolder {
368367
for folder, evidences := range folders {
369-
370368
detail, found := lo.Find(lo.Values(controls), func(cd controlInfo) bool {
371369
return sanitizeRefCode(cd.RefCode) == folder
372370
})
@@ -454,7 +452,7 @@ func downloadFile(ctx context.Context, url string) ([]byte, error) {
454452
return nil, fmt.Errorf("could not create download request: %w", err)
455453
}
456454

457-
resp, err := http.DefaultClient.Do(req)
455+
resp, err := http.DefaultClient.Do(req) //nolint:gosec // URL comes from presigned file URLs
458456
if err != nil {
459457
return nil, fmt.Errorf("could not download file: %w", err)
460458
}
@@ -499,7 +497,7 @@ func createMetadataContent(refCode string, control controlInfo, evidences []evid
499497
return []byte(b.String())
500498
}
501499

502-
// we want to have files like file-001, file-002 e.g
500+
//nolint:mnd // we want to have files like file-001, file-002 e.g
503501
func padFileNameWidth(count int) int {
504502
switch {
505503
case count <= 99:

0 commit comments

Comments
 (0)