remove error support

Signed-off-by: Yuri Shkuro <[email protected]>

Author: yurishkuro

confmap/provider/envprovider/provider.go

@@ -31,9 +31,6 @@ type provider struct {
 // A default value for unset variable can be provided after :- suffix, for example:
 // `env:NAME_OF_ENVIRONMENT_VARIABLE:-default_value`
 //
-// An error message for unset variable can be provided after :? suffix, for example:
-// `env:NAME_OF_ENVIRONMENT_VARIABLE:?error_message`
-//
 // See also: https://opentelemetry.io/docs/specs/otel/configuration/file-configuration/#environment-variable-substitution
 func NewFactory() confmap.ProviderFactory {
 	return confmap.NewProviderFactory(newProvider)
@@ -49,7 +46,7 @@ func (emp *provider) Retrieve(_ context.Context, uri string, _ confmap.WatcherFu
 	if !strings.HasPrefix(uri, schemeName+":") {
 		return nil, fmt.Errorf("%q uri is not supported by %q provider", uri, schemeName)
 	}
-	envVarName, defaultValuePtr, errorMessagePtr, err := parseEnvVarURI(uri[len(schemeName)+1:])
+	envVarName, defaultValuePtr, err := parseEnvVarURI(uri[len(schemeName)+1:])
 	if err != nil {
 		return nil, err
 	}
@@ -59,9 +56,6 @@ func (emp *provider) Retrieve(_ context.Context, uri string, _ confmap.WatcherFu
 
 	val, exists := os.LookupEnv(envVarName)
 	if !exists {
-		if errorMessagePtr != nil {
-			return nil, fmt.Errorf("environment variable %q is not set: %s", envVarName, *errorMessagePtr)
-		}
 		if defaultValuePtr != nil {
 			val = *defaultValuePtr
 		} else {
@@ -82,21 +76,13 @@ func (*provider) Shutdown(context.Context) error {
 	return nil
 }
 
-// returns (var name, default value, error message, parse error)
-func parseEnvVarURI(uri string) (string, *string, *string, error) {
+// returns (var name, default value, parse error)
+func parseEnvVarURI(uri string) (string, *string, error) {
 	const defaultSuffix = ":-"
 	const errorSuffix = ":?"
 	if strings.Contains(uri, defaultSuffix) {
 		parts := strings.SplitN(uri, defaultSuffix, 2)
-		return parts[0], &parts[1], nil, nil
-	}
-	if strings.Contains(uri, errorSuffix) {
-		parts := strings.SplitN(uri, errorSuffix, 2)
-		errMsg := parts[1]
-		if errMsg == "" {
-			return "", nil, nil, fmt.Errorf("empty error message for unset environment variable: %q", uri)
-		}
-		return parts[0], nil, &errMsg, nil
+		return parts[0], &parts[1], nil
 	}
-	return uri, nil, nil, nil
+	return uri, nil, nil
 }

confmap/provider/envprovider/provider_test.go

@@ -190,41 +190,6 @@ func TestEnvWithDefaultValue(t *testing.T) {
 	assert.NoError(t, env.Shutdown(context.Background()))
 }
 
-func TestEnvWithErrorMessage(t *testing.T) {
-	env := createProvider()
-	tests := []struct {
-		name        string
-		unset       bool
-		value       string
-		uri         string
-		expectedErr string
-	}{
-		{name: "unset", unset: true, uri: "env:MY_VAR:?foobar", expectedErr: "foobar"},
-		{name: "unset2", unset: true, uri: "env:MY_VAR:?", expectedErr: "empty error message"},
-		{name: "empty", value: "", uri: "env:MY_VAR:?foo", expectedErr: ""}, // empty value does not cause error
-		{name: "not empty", value: "value", uri: "env:MY_VAR:?foo", expectedErr: ""},
-		{name: "syntax1", unset: true, uri: "env:?MY_VAR", expectedErr: "invalid name"},
-		{name: "syntax2", unset: true, uri: "env:MY_VAR:?test:?test", expectedErr: "test:?test"},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			if !test.unset {
-				t.Setenv("MY_VAR", test.value)
-			}
-			ret, err := env.Retrieve(context.Background(), test.uri, nil)
-			if test.expectedErr == "" {
-				require.NoError(t, err)
-				str, err2 := ret.AsString()
-				require.NoError(t, err2)
-				assert.Equal(t, test.value, str)
-			} else {
-				assert.ErrorContains(t, err, test.expectedErr)
-			}
-		})
-	}
-	assert.NoError(t, env.Shutdown(context.Background()))
-}
-
 func createProvider() confmap.Provider {
 	return NewFactory().Create(confmaptest.NewNopProviderSettings())
 }