From 44825cac61afd712f9edbed5af7cc0cfdcd08d90 Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 13 Jun 2024 11:57:04 +0200 Subject: [PATCH] lint: gocritic (preferStringWriter) --- .golangci.yml | 1 - pkg/apiserver/controllers/v1/decisions.go | 22 +++++++++++----------- pkg/setup/units.go | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 2c2d58dfa5c..3787ca05a64 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -201,7 +201,6 @@ linters-settings: - equalFold # - unnecessaryBlock # - ptrToRefParam # - - preferStringWriter # - stringXbytes # - appendAssign # - tooManyResultsChecker diff --git a/pkg/apiserver/controllers/v1/decisions.go b/pkg/apiserver/controllers/v1/decisions.go index 3d8e0232224..578280b8130 100644 --- a/pkg/apiserver/controllers/v1/decisions.go +++ b/pkg/apiserver/controllers/v1/decisions.go @@ -160,7 +160,7 @@ func writeStartupDecisions(gctx *gin.Context, filters map[string][]string, dbFun if needComma { //respBuffer.Write([]byte(",")) - gctx.Writer.Write([]byte(",")) + gctx.Writer.WriteString(",") } else { needComma = true } @@ -212,7 +212,7 @@ func writeDeltaDecisions(gctx *gin.Context, filters map[string][]string, lastPul if needComma { //respBuffer.Write([]byte(",")) - gctx.Writer.Write([]byte(",")) + gctx.Writer.WriteString(",") } else { needComma = true } @@ -244,7 +244,7 @@ func (c *Controller) StreamDecisionChunked(gctx *gin.Context, bouncerInfo *ent.B gctx.Writer.Header().Set("Content-Type", "application/json") gctx.Writer.Header().Set("Transfer-Encoding", "chunked") gctx.Writer.WriteHeader(http.StatusOK) - gctx.Writer.Write([]byte(`{"new": [`)) //No need to check for errors, the doc says it always returns nil + gctx.Writer.WriteString(`{"new": [`) //No need to check for errors, the doc says it always returns nil // if the blocker just started, return all decisions if val, ok := gctx.Request.URL.Query()["startup"]; ok && val[0] == "true" { @@ -252,48 +252,48 @@ func (c *Controller) StreamDecisionChunked(gctx *gin.Context, bouncerInfo *ent.B err := writeStartupDecisions(gctx, filters, c.DBClient.QueryAllDecisionsWithFilters) if err != nil { log.Errorf("failed sending new decisions for startup: %v", err) - gctx.Writer.Write([]byte(`], "deleted": []}`)) + gctx.Writer.WriteString(`], "deleted": []}`) gctx.Writer.Flush() return err } - gctx.Writer.Write([]byte(`], "deleted": [`)) + gctx.Writer.WriteString(`], "deleted": [`) //Expired decisions err = writeStartupDecisions(gctx, filters, c.DBClient.QueryExpiredDecisionsWithFilters) if err != nil { log.Errorf("failed sending expired decisions for startup: %v", err) - gctx.Writer.Write([]byte(`]}`)) + gctx.Writer.WriteString(`]}`) gctx.Writer.Flush() return err } - gctx.Writer.Write([]byte(`]}`)) + gctx.Writer.WriteString(`]}`) gctx.Writer.Flush() } else { err = writeDeltaDecisions(gctx, filters, bouncerInfo.LastPull, c.DBClient.QueryNewDecisionsSinceWithFilters) if err != nil { log.Errorf("failed sending new decisions for delta: %v", err) - gctx.Writer.Write([]byte(`], "deleted": []}`)) + gctx.Writer.WriteString(`], "deleted": []}`) gctx.Writer.Flush() return err } - gctx.Writer.Write([]byte(`], "deleted": [`)) + gctx.Writer.WriteString(`], "deleted": [`) err = writeDeltaDecisions(gctx, filters, bouncerInfo.LastPull, c.DBClient.QueryExpiredDecisionsSinceWithFilters) if err != nil { log.Errorf("failed sending expired decisions for delta: %v", err) - gctx.Writer.Write([]byte(`]}`)) + gctx.Writer.WriteString("]}") gctx.Writer.Flush() return err } - gctx.Writer.Write([]byte(`]}`)) + gctx.Writer.WriteString("]}") gctx.Writer.Flush() } diff --git a/pkg/setup/units.go b/pkg/setup/units.go index 845dd937a81..861513d3f1d 100644 --- a/pkg/setup/units.go +++ b/pkg/setup/units.go @@ -35,7 +35,7 @@ func systemdUnitList() ([]string, error) { for scanner.Scan() { line := scanner.Text() - if line != "" { + if line == "" { break // the rest of the output is footer }