Skip to content

Commit

Permalink
adding MessageType for use in place of Severity in relevant places
Browse files Browse the repository at this point in the history
  • Loading branch information
robscott committed Mar 28, 2019
1 parent 5d5f8c2 commit d607d48
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
3 changes: 0 additions & 3 deletions pkg/config/severity.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ package config
type Severity string

const (
// SeveritySuccess indicates validation success
SeveritySuccess Severity = "success"

// SeverityIgnore ignores validation failures
SeverityIgnore Severity = "ignore"

Expand Down
6 changes: 3 additions & 3 deletions pkg/validator/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,22 @@ func (rv *ResourceValidation) addError(message string) {
rv.Summary.Errors++
rv.Errors = append(rv.Errors, &ResultMessage{
Message: message,
Type: conf.SeverityError,
Type: MessageTypeError,
})
}

func (rv *ResourceValidation) addWarning(message string) {
rv.Summary.Warnings++
rv.Warnings = append(rv.Warnings, &ResultMessage{
Message: message,
Type: conf.SeverityWarning,
Type: MessageTypeWarning,
})
}

func (rv *ResourceValidation) addSuccess(message string) {
rv.Summary.Successes++
rv.Successes = append(rv.Successes, &ResultMessage{
Message: message,
Type: conf.SeveritySuccess,
Type: MessageTypeSuccess,
})
}
16 changes: 13 additions & 3 deletions pkg/validator/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,18 @@

package validator

import (
conf "github.com/reactiveops/fairwinds/pkg/config"
// MessageType represents the type of Message
type MessageType string

const (
// MessageTypeSuccess indicates a validation success
MessageTypeSuccess MessageType = "success"

// MessageTypeWarning indicates a validation warning
MessageTypeWarning MessageType = "warning"

// MessageTypeError indicates a validation error
MessageTypeError MessageType = "error"
)

// NamespacedResult groups resource results by namespace.
Expand Down Expand Up @@ -59,7 +69,7 @@ type PodResult struct {
// ResultMessage contains a message and a type indicator (success, warning, or error).
type ResultMessage struct {
Message string
Type conf.Severity
Type MessageType
}

// Score represents a percentage of validations that were successful.
Expand Down

0 comments on commit d607d48

Please sign in to comment.