Skip to content

Commit

Permalink
pkg/prometheus/promcfg*.go: Fix error string nits
Browse files Browse the repository at this point in the history
  • Loading branch information
slashpai committed Sep 28, 2021
1 parent aaa5a42 commit 6351b32
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions pkg/prometheus/promcfg.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ func validateBodySizeLimit(enforcedLimit string) error {
_, err := units.ParseBase2Bytes(enforcedLimit)

if err != nil {
return errors.Wrap(err, "Invalid body_size_limit value specified")
return errors.Wrap(err, "invalid enforcedBodySizeLimit value specified")
}
return nil
}
Expand All @@ -254,7 +254,7 @@ func (cg *ConfigGenerator) GenerateConfig(
err := validateConfigInputs(p)

if err != nil {
return nil, errors.Wrap(err, "Invalid config value passed")
return nil, errors.Wrap(err, "invalid config value passed")
}

versionStr := p.Spec.Version
Expand Down
8 changes: 4 additions & 4 deletions pkg/prometheus/promcfg_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5807,22 +5807,22 @@ alerting:
{
version: "v2.28.0",
enforcedBodySizeLimit: "100",
expectedErr: errors.New("Invalid config value passed: Invalid body_size_limit value specified: units: unknown unit in 100"),
expectedErr: errors.New("invalid config value passed: invalid enforcedBodySizeLimit value specified: units: unknown unit in 100"),
},
{
version: "v2.28.0",
enforcedBodySizeLimit: "200kb",
expectedErr: errors.New("Invalid config value passed: Invalid body_size_limit value specified: units: unknown unit kb in 200kb"),
expectedErr: errors.New("invalid config value passed: invalid enforcedBodySizeLimit value specified: units: unknown unit kb in 200kb"),
},
{
version: "v2.28.0",
enforcedBodySizeLimit: "300 MB",
expectedErr: errors.New("Invalid config value passed: Invalid body_size_limit value specified: units: unknown unit MB in 300 MB"),
expectedErr: errors.New("invalid config value passed: invalid enforcedBodySizeLimit value specified: units: unknown unit MB in 300 MB"),
},
{
version: "v2.28.0",
enforcedBodySizeLimit: "150M",
expectedErr: errors.New("Invalid config value passed: Invalid body_size_limit value specified: units: unknown unit M in 150M"),
expectedErr: errors.New("invalid config value passed: invalid enforcedBodySizeLimit value specified: units: unknown unit M in 150M"),
},
} {
t.Run(fmt.Sprintf("%s enforcedBodySizeLimit(%s)", tc.version, tc.enforcedBodySizeLimit), func(t *testing.T) {
Expand Down

0 comments on commit 6351b32

Please sign in to comment.