Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
66 changes: 33 additions & 33 deletions result/overall.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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()
}
Loading