diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index f7a7d44..91555aa 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -13,6 +13,6 @@ jobs: - uses: actions/checkout@v4 - name: golangci-lint - uses: golangci/golangci-lint-action@v7 + uses: golangci/golangci-lint-action@v8 with: - version: v2.0.2 + version: v2.1.6 diff --git a/result/overall.go b/result/overall.go index 1a9994e..e822ef5 100644 --- a/result/overall.go +++ b/result/overall.go @@ -262,39 +262,6 @@ func (o *Overall) GetOutput() string { return output.String() } -// getPerfdata returns all subsequent perfdata as a concatenated string -func (s *PartialResult) getPerfdata() string { - var output strings.Builder - - if len(s.Perfdata) > 0 { - output.WriteString(s.Perfdata.String()) - } - - if s.PartialResults != nil { - for _, ss := range s.PartialResults { - output.WriteString(" " + ss.getPerfdata()) - } - } - - return strings.TrimSpace(output.String()) -} - -// getOutput generates indented output for all subsequent PartialResults -func (s *PartialResult) getOutput(indentLevel int) string { - var output strings.Builder - - prefix := strings.Repeat(" ", indentLevel) - output.WriteString(prefix + "\\_ " + s.String() + "\n") - - if s.PartialResults != nil { - for _, ss := range s.PartialResults { - output.WriteString(ss.getOutput(indentLevel + indentationOffset)) - } - } - - return output.String() -} - // SetDefaultState sets a new default state for a PartialResult func (s *PartialResult) SetDefaultState(state int) error { if state < check.OK || state > check.Unknown { @@ -342,3 +309,36 @@ func (s *PartialResult) GetStatus() int { return WorstState(states...) } + +// getPerfdata returns all subsequent perfdata as a concatenated string +func (s *PartialResult) getPerfdata() string { + var output strings.Builder + + if len(s.Perfdata) > 0 { + output.WriteString(s.Perfdata.String()) + } + + if s.PartialResults != nil { + for _, ss := range s.PartialResults { + output.WriteString(" " + ss.getPerfdata()) + } + } + + return strings.TrimSpace(output.String()) +} + +// getOutput generates indented output for all subsequent PartialResults +func (s *PartialResult) getOutput(indentLevel int) string { + var output strings.Builder + + prefix := strings.Repeat(" ", indentLevel) + output.WriteString(prefix + "\\_ " + s.String() + "\n") + + if s.PartialResults != nil { + for _, ss := range s.PartialResults { + output.WriteString(ss.getOutput(indentLevel + indentationOffset)) + } + } + + return output.String() +}