Skip to content

Commit

Permalink
lint: gocritic (preferStringWriter)
Browse files Browse the repository at this point in the history
  • Loading branch information
mmetc committed Sep 16, 2024
1 parent eb56406 commit 44825ca
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
1 change: 0 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ linters-settings:
- equalFold #
- unnecessaryBlock #
- ptrToRefParam #
- preferStringWriter #
- stringXbytes #
- appendAssign #
- tooManyResultsChecker
Expand Down
22 changes: 11 additions & 11 deletions pkg/apiserver/controllers/v1/decisions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -244,56 +244,56 @@ 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" {
// Active decisions
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()
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/setup/units.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit 44825ca

Please sign in to comment.