Fix inconsistent error messages in units.parse* (#5046)

Adding `error: ` to each message is redundant, and breaks tooling
that expects a uniform format of `<builtin-name>: message` in error
messages from OPA (i.e. Jarl 😄).

Signed-off-by: Anders Eknert <anders@eknert.com>
This commit is contained in:
Anders Eknert
2022-08-24 11:00:45 +02:00
committed by GitHub
parent 239d35f2a2
commit 8dc77b0e8e
4 changed files with 16 additions and 16 deletions
+7 -7
View File
@@ -9,7 +9,7 @@ cases:
note: units_parse_bytes/failure
query: data.test.p = x
want_error_code: eval_builtin_error
want_error: "units.parse_bytes error: no byte amount provided"
want_error: "units.parse_bytes: no byte amount provided"
strict_error: true
- data:
modules:
@@ -21,7 +21,7 @@ cases:
note: units_parse_bytes/failure
query: data.test.p = x
want_error_code: eval_builtin_error
want_error: "units.parse_bytes error: no byte amount provided"
want_error: "units.parse_bytes: no byte amount provided"
strict_error: true
- data:
modules:
@@ -33,7 +33,7 @@ cases:
note: units_parse_bytes/failure
query: data.test.p = x
want_error_code: eval_builtin_error
want_error: "units.parse_bytes error: no byte amount provided"
want_error: "units.parse_bytes: no byte amount provided"
strict_error: true
- data:
modules:
@@ -45,7 +45,7 @@ cases:
note: units_parse_bytes/failure
query: data.test.p = x
want_error_code: eval_builtin_error
want_error: "units.parse_bytes error: could not parse byte amount to a number"
want_error: "units.parse_bytes: could not parse byte amount to a number"
strict_error: true
- data:
modules:
@@ -57,7 +57,7 @@ cases:
note: units_parse_bytes/failure
query: data.test.p = x
want_error_code: eval_builtin_error
want_error: "units.parse_bytes error: could not parse byte amount to a number"
want_error: "units.parse_bytes: could not parse byte amount to a number"
strict_error: true
- data:
modules:
@@ -69,7 +69,7 @@ cases:
note: units_parse_bytes/failure
query: data.test.p = x
want_error_code: eval_builtin_error
want_error: "units.parse_bytes error: spaces not allowed in resource strings"
want_error: "units.parse_bytes: spaces not allowed in resource strings"
strict_error: true
- data:
modules:
@@ -81,5 +81,5 @@ cases:
note: units_parse_bytes/failure
query: data.test.p = x
want_error_code: eval_builtin_error
want_error: "units.parse_bytes error: spaces not allowed in resource strings"
want_error: "units.parse_bytes: spaces not allowed in resource strings"
strict_error: true
+7 -7
View File
@@ -9,7 +9,7 @@ cases:
note: units_parse/failure
query: data.test.p = x
want_error_code: eval_builtin_error
want_error: "units.parse error: no amount provided"
want_error: "units.parse: no amount provided"
strict_error: true
- data:
modules:
@@ -21,7 +21,7 @@ cases:
note: units_parse/failure
query: data.test.p = x
want_error_code: eval_builtin_error
want_error: "units.parse error: no amount provided"
want_error: "units.parse: no amount provided"
strict_error: true
- data:
modules:
@@ -33,7 +33,7 @@ cases:
note: units_parse/failure
query: data.test.p = x
want_error_code: eval_builtin_error
want_error: "units.parse error: no amount provided"
want_error: "units.parse: no amount provided"
strict_error: true
- data:
modules:
@@ -45,7 +45,7 @@ cases:
note: units_parse/failure
query: data.test.p = x
want_error_code: eval_builtin_error
want_error: "units.parse error: could not parse amount to a number"
want_error: "units.parse: could not parse amount to a number"
strict_error: true
- data:
modules:
@@ -57,7 +57,7 @@ cases:
note: units_parse/failure
query: data.test.p = x
want_error_code: eval_builtin_error
want_error: "units.parse error: could not parse amount to a number"
want_error: "units.parse: could not parse amount to a number"
strict_error: true
- data:
modules:
@@ -69,7 +69,7 @@ cases:
note: units_parse/failure
query: data.test.p = x
want_error_code: eval_builtin_error
want_error: "units.parse error: spaces not allowed in resource strings"
want_error: "units.parse: spaces not allowed in resource strings"
strict_error: true
- data:
modules:
@@ -81,5 +81,5 @@ cases:
note: units_parse/failure
query: data.test.p = x
want_error_code: eval_builtin_error
want_error: "units.parse error: spaces not allowed in resource strings"
want_error: "units.parse: spaces not allowed in resource strings"
strict_error: true
+1 -1
View File
@@ -32,7 +32,7 @@ const (
)
func parseNumBytesError(msg string) error {
return fmt.Errorf("%s error: %s", ast.UnitsParseBytes.Name, msg)
return fmt.Errorf("%s: %s", ast.UnitsParseBytes.Name, msg)
}
func errBytesUnitNotRecognized(unit string) error {
+1 -1
View File
@@ -26,7 +26,7 @@ const (
)
func parseUnitsError(msg string) error {
return fmt.Errorf("%s error: %s", ast.UnitsParse.Name, msg)
return fmt.Errorf("%s: %s", ast.UnitsParse.Name, msg)
}
func errUnitNotRecognized(unit string) error {