Skip to content

Commit 2371713

Browse files
committed
lint
1 parent 5b887ee commit 2371713

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

  • go/cmd/first_package_finder
  • vulnfeeds/cmd/converters/dsa-dla-dtsa

go/cmd/first_package_finder/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ func main() {
262262
codenameToVersion, err := loadFirstPackages()
263263
if err != nil {
264264
logger.Error("Failed to load first packages", "err", err)
265-
logger.Close() //nolint:errcheck
266-
os.Exit(1)
265+
logger.Close()
266+
os.Exit(1) //nolint:gocritic
267267
}
268268

269269
logger.Info("first_package loaded, begin writing out data")

vulnfeeds/cmd/converters/dsa-dla-dtsa/main.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ const (
4141

4242
var (
4343
leadingWhitespacePattern = regexp.MustCompile(`^\s`)
44-
dsaPattern = regexp.MustCompile(`\[(.*?)]\s*([\w-]+)\s*(.*)`) // e.g. [25 Apr 2022] DSA-5124-1 ffmpeg - security update
45-
versionPattern = regexp.MustCompile(`\[(.*?)]\s*-\s*([^\s]+)\s*([^\s]+)`) // e.g. [buster] - xz-utils 5.2.4-1+deb10u1
44+
dsaPattern = regexp.MustCompile(`\[(.*?)]\s*([\w-]+)\s*(.*)`) // e.g. [25 Apr 2022] DSA-5124-1 ffmpeg - security update
45+
versionPattern = regexp.MustCompile(`\[(.*?)]\s*-\s*([^\s]+)\s*([^\s]+)`) // e.g. [buster] - xz-utils 5.2.4-1+deb10u1
4646
wmlDescriptionPattern = regexp.MustCompile(`(?s)<define-tag moreinfo>(.*?)</define-tag>`) // e.g. <define-tag moreinfo>\n Some html here \n</define-tag>
47-
wmlReportDatePattern = regexp.MustCompile(`<define-tag report_date>(.*?)</define-tag>`) // e.g. <define-tag report_date>2022-1-04</define-tag>
48-
dsaOrDlaWithNoExtPattern = regexp.MustCompile(`d[sl]a-\d+`) // e.g. DSA-12345-2, -2 is the extension
47+
wmlReportDatePattern = regexp.MustCompile(`<define-tag report_date>(.*?)</define-tag>`) // e.g. <define-tag report_date>2022-1-04</define-tag>
48+
dsaOrDlaWithNoExtPattern = regexp.MustCompile(`d[sl]a-\d+`) // e.g. DSA-12345-2, -2 is the extension
4949
)
5050

5151
type AdvisoryType string
@@ -495,14 +495,14 @@ func main() {
495495

496496
if *outputDir == "" {
497497
logger.Error("Output directory is required")
498-
logger.Close()
499-
os.Exit(1) //nolint:errcheck
498+
logger.Close()
499+
os.Exit(1) //nolint:gocritic
500500
}
501501

502502
if err := run(*webwmlRepo, *securityTrackerRepo, *outputDir, *outputBucket, *uploadToGCS, *doDeletions, *numWorkers); err != nil {
503503
logger.Error("Execution failed", "err", err)
504-
logger.Close()
505-
os.Exit(1) //nolint:errcheck
504+
logger.Close()
505+
os.Exit(1) //nolint:gocritic
506506
}
507507
}
508508

0 commit comments

Comments
 (0)