[chore] cleanup tostring function, remove unclear uri parameter (open…

…-telemetry#10244)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>

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)
 	}
 }
 

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 {})`)
 }