Skip to content

Commit d071845

Browse files
committed
errors: add WithWrapperErrorMsgf
Currently WithWrapperErrorMsg wants a format and args like fmt.Sprintf but new go vet checks for non-constant format string in calls so it cannot be used for dynamic messages. Fix this by renaming WithWrapperErrorMsg to WithWrapperErrorMsgf and adding WithWrapperErrorMsg that uses fmt.Sprint .
1 parent ba6c38c commit d071845

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

internal/objectstorage/objectstorage.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ type ErrNotExist struct {
4343

4444
func NewErrNotExist(err error, format string, args ...interface{}) error {
4545
return &ErrNotExist{
46-
util.NewWrapperError(err, util.WithWrapperErrorMsg(format, args...)),
46+
util.NewWrapperError(err, util.WithWrapperErrorMsgf(format, args...)),
4747
}
4848
}
4949

internal/util/errors.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,18 @@ func NewWrapperError(err error, options ...WrapperErrorOption) *WrapperError {
116116

117117
type WrapperErrorOption func(e *WrapperError)
118118

119-
func WithWrapperErrorMsg(format string, args ...interface{}) WrapperErrorOption {
119+
func WithWrapperErrorMsgf(format string, args ...any) WrapperErrorOption {
120120
return func(e *WrapperError) {
121121
e.msg = fmt.Sprintf(format, args...)
122122
}
123123
}
124124

125+
func WithWrapperErrorMsg(format string, a ...any) WrapperErrorOption {
126+
return func(e *WrapperError) {
127+
e.msg = fmt.Sprint(a...)
128+
}
129+
}
130+
125131
func WithWrapperErrorCallerDepth(depth int) WrapperErrorOption {
126132
return func(e *WrapperError) {
127133
e.stack = errors.Callers(depth + 1)

0 commit comments

Comments
 (0)