From a83e2c5f588b7466bb6c6634ba620bf32f9511bb Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Tue, 28 May 2024 10:18:21 -0700 Subject: [PATCH] [chore] cleanup tostring function, remove unclear uri parameter Signed-off-by: Bogdan Drutu --- confmap/expand.go | 8 ++++---- confmap/expand_test.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/confmap/expand.go b/confmap/expand.go index a913e768942..05ec5a31162 100644 --- a/confmap/expand.go +++ b/confmap/expand.go @@ -113,15 +113,15 @@ func (mr *Resolver) findAndExpandURI(ctx context.Context, input string) (any, bo if err != nil { return input, false, err } - repl, err := toString(uri, expanded) + repl, err := toString(expanded) if err != nil { - return input, false, err + return input, false, fmt.Errorf("expanding %v: %w", uri, err) } return strings.ReplaceAll(input, uri, repl), changed, err } // toString attempts to convert input to a string. -func toString(strURI string, input any) (string, error) { +func toString(input any) (string, error) { // This list must be kept in sync with checkRawConfType. val := reflect.ValueOf(input) switch val.Kind() { @@ -134,7 +134,7 @@ func toString(strURI string, input any) (string, error) { case reflect.Bool: return strconv.FormatBool(val.Bool()), nil default: - return "", fmt.Errorf("expanding %v, expected convertable to string value type, got %q(%T)", strURI, input, input) + return "", fmt.Errorf("expected convertable to string value type, got %q(%T)", input, input) } } diff --git a/confmap/expand_test.go b/confmap/expand_test.go index c1dc6646152..984a96a2995 100644 --- a/confmap/expand_test.go +++ b/confmap/expand_test.go @@ -457,5 +457,5 @@ func TestResolverExpandStringValueInvalidReturnValue(t *testing.T) { require.NoError(t, err) _, err = resolver.Resolve(context.Background()) - assert.EqualError(t, err, `expanding ${test:PORT}, expected convertable to string value type, got ['ӛ']([]interface {})`) + assert.EqualError(t, err, `expanding ${test:PORT}: expected convertable to string value type, got ['ӛ']([]interface {})`) }