From cf9c62fcc0e089cea4c49428987c5b6dfe5996aa Mon Sep 17 00:00:00 2001 From: Bernhard Reiter Date: Thu, 23 Oct 2025 16:09:18 +0200 Subject: [PATCH] silence revive linter warnings that we cannot or do not want to fix yet --- csaf/advisory.go | 39 ++++++++++++++++++++++----------------- internal/misc/mime.go | 2 +- util/client.go | 2 +- util/csv.go | 2 +- util/csv_test.go | 2 +- util/set.go | 2 +- util/url_test.go | 3 ++- 7 files changed, 29 insertions(+), 23 deletions(-) diff --git a/csaf/advisory.go b/csaf/advisory.go index cc2516a..61c9a65 100644 --- a/csaf/advisory.go +++ b/csaf/advisory.go @@ -444,10 +444,11 @@ var csafFlagLabelPattern = alternativesUnmarshal( // machine readable flag. For example, this could be a machine readable justification // code why a product is not affected. type Flag struct { - Date *string `json:"date,omitempty"` - GroupIDs *ProductGroups `json:"group_ids,omitempty"` - Label *FlagLabel `json:"label"` // required - ProductIds *Products `json:"product_ids,omitempty"` + Date *string `json:"date,omitempty"` + GroupIDs *ProductGroups `json:"group_ids,omitempty"` + Label *FlagLabel `json:"label"` // required + //revive:disable-next-line:var-naming until new major version w fix + ProductIds *Products `json:"product_ids,omitempty"` } // Flags is a list if Flag elements. @@ -606,14 +607,16 @@ type RestartRequired struct { // Remediation specifies details on how to handle (and presumably, fix) a vulnerability. type Remediation struct { - Category *RemediationCategory `json:"category"` // required - Date *string `json:"date,omitempty"` - Details *string `json:"details"` // required - Entitlements []*string `json:"entitlements,omitempty"` - GroupIds *ProductGroups `json:"group_ids,omitempty"` - ProductIds *Products `json:"product_ids,omitempty"` - RestartRequired *RestartRequired `json:"restart_required,omitempty"` - URL *string `json:"url,omitempty"` + Category *RemediationCategory `json:"category"` // required + Date *string `json:"date,omitempty"` + Details *string `json:"details"` // required + Entitlements []*string `json:"entitlements,omitempty"` + //revive:disable:var-naming until new major version w fix + GroupIds *ProductGroups `json:"group_ids,omitempty"` + ProductIds *Products `json:"product_ids,omitempty"` + //revive:enable + RestartRequired *RestartRequired `json:"restart_required,omitempty"` + URL *string `json:"url,omitempty"` } // Remediations is a list of Remediation elements. @@ -739,11 +742,13 @@ var csafThreatCategoryPattern = alternativesUnmarshal( // Threat contains information about a vulnerability that can change with time. type Threat struct { - Category *ThreatCategory `json:"category"` // required - Date *string `json:"date,omitempty"` - Details *string `json:"details"` // required - GroupIds *ProductGroups `json:"group_ids,omitempty"` - ProductIds *Products `json:"product_ids,omitempty"` + Category *ThreatCategory `json:"category"` // required + Date *string `json:"date,omitempty"` + Details *string `json:"details"` // required + //revive:disable:var-naming until new major version w fix + GroupIds *ProductGroups `json:"group_ids,omitempty"` + ProductIds *Products `json:"product_ids,omitempty"` + //revive:enable } // Threats is a list of Threat elements. diff --git a/internal/misc/mime.go b/internal/misc/mime.go index acc1ba3..3b3662d 100644 --- a/internal/misc/mime.go +++ b/internal/misc/mime.go @@ -6,7 +6,7 @@ // SPDX-FileCopyrightText: 2023 German Federal Office for Information Security (BSI) // Software-Engineering: 2023 Intevation GmbH -package misc +package misc //revive:disable-line:var-naming import ( "fmt" diff --git a/util/client.go b/util/client.go index b4478ca..957d777 100644 --- a/util/client.go +++ b/util/client.go @@ -6,7 +6,7 @@ // SPDX-FileCopyrightText: 2022 German Federal Office for Information Security (BSI) // Software-Engineering: 2022 Intevation GmbH -package util +package util //revive:disable-line:var-naming import ( "context" diff --git a/util/csv.go b/util/csv.go index d84644c..6f9c0f4 100644 --- a/util/csv.go +++ b/util/csv.go @@ -6,7 +6,7 @@ // SPDX-FileCopyrightText: 2022 German Federal Office for Information Security (BSI) // Software-Engineering: 2022 Intevation GmbH -package util +package util //revive:disable-line:var-naming import ( "bufio" diff --git a/util/csv_test.go b/util/csv_test.go index 575d83d..0dd24c7 100644 --- a/util/csv_test.go +++ b/util/csv_test.go @@ -6,7 +6,7 @@ // SPDX-FileCopyrightText: 2022 German Federal Office for Information Security (BSI) // Software-Engineering: 2022 Intevation GmbH -package util +package util //revive:disable-line:var-naming import ( "bytes" diff --git a/util/set.go b/util/set.go index 61eb14b..f3d136b 100644 --- a/util/set.go +++ b/util/set.go @@ -6,7 +6,7 @@ // SPDX-FileCopyrightText: 2023 German Federal Office for Information Security (BSI) // Software-Engineering: 2023 Intevation GmbH -package util +package util //revive:disable-line:var-naming // Set is a simple set type. type Set[K comparable] map[K]struct{} diff --git a/util/url_test.go b/util/url_test.go index dec73dc..fb2804a 100644 --- a/util/url_test.go +++ b/util/url_test.go @@ -6,7 +6,8 @@ // SPDX-FileCopyrightText: 2022 German Federal Office for Information Security (BSI) // Software-Engineering: 2022 Intevation GmbH -package util +package util //revive:disable-line:var-naming + import ( "net/url"