chore(linter): Address findings for `staticcheck->QF1001` - Apply De Morgan’s law (#16881)

This commit is contained in:
Paweł Żak 2025-04-30 18:43:13 +02:00 committed by GitHub
parent 713bd56bcc
commit 2e246d0270
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 24 additions and 25 deletions

View File

@ -361,7 +361,7 @@ func (t *Telegraf) runAgent(ctx context.Context, reloadConfig bool) error {
} }
} }
if !(t.test || t.testWait != 0) && len(c.Outputs) == 0 { if !t.test && t.testWait == 0 && len(c.Outputs) == 0 {
return errors.New("no outputs found, probably invalid config file provided") return errors.New("no outputs found, probably invalid config file provided")
} }
if t.plugindDir == "" && len(c.Inputs) == 0 { if t.plugindDir == "" && len(c.Inputs) == 0 {

View File

@ -62,7 +62,7 @@ func (cfg *Config) NewClient(app string, log telegraf.Logger) (*Client, error) {
cfg.MetricsGrouping = TablePerMetric cfg.MetricsGrouping = TablePerMetric
} }
if !(cfg.MetricsGrouping == SingleTable || cfg.MetricsGrouping == TablePerMetric) { if cfg.MetricsGrouping != SingleTable && cfg.MetricsGrouping != TablePerMetric {
return nil, errors.New("metrics grouping type is not valid") return nil, errors.New("metrics grouping type is not valid")
} }

View File

@ -175,20 +175,20 @@ func (h *Fluentd) Gather(acc telegraf.Accumulator) error {
tmpFields["buffer_available_buffer_space_ratios"] = *p.AvailBufferSpaceRatios tmpFields["buffer_available_buffer_space_ratios"] = *p.AvailBufferSpaceRatios
} }
if !((p.BufferQueueLength == nil) && if p.BufferQueueLength != nil ||
(p.RetryCount == nil) && p.RetryCount != nil ||
(p.BufferTotalQueuedSize == nil) && p.BufferTotalQueuedSize != nil ||
(p.EmitCount == nil) && p.EmitCount != nil ||
(p.EmitRecords == nil) && p.EmitRecords != nil ||
(p.EmitSize == nil) && p.EmitSize != nil ||
(p.WriteCount == nil) && p.WriteCount != nil ||
(p.FlushTimeCount == nil) && p.FlushTimeCount != nil ||
(p.SlowFlushCount == nil) && p.SlowFlushCount != nil ||
(p.RollbackCount == nil) && p.RollbackCount != nil ||
(p.BufferStageLength == nil) && p.BufferStageLength != nil ||
(p.BufferStageByteSize == nil) && p.BufferStageByteSize != nil ||
(p.BufferQueueByteSize == nil) && p.BufferQueueByteSize != nil ||
(p.AvailBufferSpaceRatios == nil)) { p.AvailBufferSpaceRatios != nil {
acc.AddFields(measurement, tmpFields, tmpTags) acc.AddFields(measurement, tmpFields, tmpTags)
} }
} }

View File

@ -65,8 +65,7 @@ func (i *Ipset) Gather(acc telegraf.Accumulator) error {
// Ignore sets created without the "counters" option // Ignore sets created without the "counters" option
nocomment := strings.Split(line, "\"")[0] nocomment := strings.Split(line, "\"")[0]
if !(strings.Contains(nocomment, "packets") && if !strings.Contains(nocomment, "packets") || !strings.Contains(nocomment, "bytes") {
strings.Contains(nocomment, "bytes")) {
continue continue
} }

View File

@ -102,7 +102,7 @@ func (a *aggregateValue) UnmarshalJSON(bytes []byte) error {
} }
func (a *aggregateValue) isAggregation() bool { func (a *aggregateValue) isAggregation() bool {
return !(a.buckets == nil) return a.buckets != nil
} }
func (b *bucketData) UnmarshalJSON(bytes []byte) error { func (b *bucketData) UnmarshalJSON(bytes []byte) error {

View File

@ -817,8 +817,8 @@ func getVMs(ctx context.Context, e *endpoint, rf *resourceFilter) (objectMap, er
for _, ip := range net.IpConfig.IpAddress { for _, ip := range net.IpConfig.IpAddress {
addr := ip.IpAddress addr := ip.IpAddress
for _, ipType := range e.parent.IPAddresses { for _, ipType := range e.parent.IPAddresses {
if !(ipType == "ipv4" && isIPv4.MatchString(addr) || if (ipType != "ipv4" || !isIPv4.MatchString(addr)) &&
ipType == "ipv6" && isIPv6.MatchString(addr)) { (ipType != "ipv6" || !isIPv6.MatchString(addr)) {
continue continue
} }

View File

@ -200,7 +200,7 @@ func (g *Graphite) checkEOF(conn net.Conn) error {
} }
// Log non-timeout errors and close. // Log non-timeout errors and close.
var netErr net.Error var netErr net.Error
if !(errors.As(err, &netErr) && netErr.Timeout()) { if !errors.As(err, &netErr) || !netErr.Timeout() {
g.Log.Debugf("conn %s checkEOF .conn.Read returned err != EOF, which is unexpected. closing conn. error: %s", conn, err) g.Log.Debugf("conn %s checkEOF .conn.Read returned err != EOF, which is unexpected. closing conn. error: %s", conn, err)
err = conn.Close() err = conn.Close()
g.Log.Debugf("Failed to close the connection: %v", err) g.Log.Debugf("Failed to close the connection: %v", err)

View File

@ -593,7 +593,7 @@ func TestSignalFx_Errors(t *testing.T) {
err := s.Write([]telegraf.Metric{m}) err := s.Write([]telegraf.Metric{m})
require.Error(t, err) require.Error(t, err)
} }
for !(len(s.client.(*errorsink).datapoints) == len(tt.want.datapoints) && len(s.client.(*errorsink).events) == len(tt.want.events)) { for len(s.client.(*errorsink).datapoints) != len(tt.want.datapoints) || len(s.client.(*errorsink).events) != len(tt.want.events) {
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
} }
if !reflect.DeepEqual(s.client.(*errorsink).datapoints, tt.want.datapoints) { if !reflect.DeepEqual(s.client.(*errorsink).datapoints, tt.want.datapoints) {

View File

@ -629,7 +629,7 @@ func (p *Parser) constructFieldName(root, node dataNode, name string, expand boo
} }
func (p *Parser) debugEmptyQuery(operation string, root dataNode, initialquery string) { func (p *Parser) debugEmptyQuery(operation string, root dataNode, initialquery string) {
if p.Log == nil || !(p.Log.Level().Includes(telegraf.Trace) || p.Trace) { // for backward compatibility if p.Log == nil || (!p.Log.Level().Includes(telegraf.Trace) && !p.Trace) { // for backward compatibility
return return
} }

View File

@ -106,7 +106,7 @@ func (w *whitelist) Check(pkg, version, spdx string) (ok, found bool) {
case "<=": case "<=":
match = pkgver.LessThan(*entry.Version) || pkgver.Equal(*entry.Version) match = pkgver.LessThan(*entry.Version) || pkgver.Equal(*entry.Version)
case ">": case ">":
match = !(pkgver.LessThan(*entry.Version) || pkgver.Equal(*entry.Version)) match = !pkgver.LessThan(*entry.Version) && !pkgver.Equal(*entry.Version)
case ">=": case ">=":
match = !pkgver.LessThan(*entry.Version) match = !pkgver.LessThan(*entry.Version)
} }