Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Evan Bradley <[email protected]>
  • Loading branch information
TylerHelmuth and evan-bradley authored Aug 6, 2024
1 parent 6dbef43 commit fd8ca4b
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .chloggen/unify-env-var-gate-stable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ change_type: breaking
component: confmap

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Set the `confmap.unifyEnvVarExpansion` feature gate to Stable. Expansion of `$FOO` env vars is no longer supporter. Use `${FOO}` or `${env:FOO}` instead.
note: Set the `confmap.unifyEnvVarExpansion` feature gate to Stable. Expansion of `$FOO` env vars is no longer supported. Use `${FOO}` or `${env:FOO}` instead.

# One or more tracking issues or pull requests related to the change
issues: [10508]
Expand Down
2 changes: 1 addition & 1 deletion confmap/converter/expandconverter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/confmap/converter/expandconverter
go 1.21.0

require (
go.opentelemetry.io/collector/confmap v0.104.0
go.opentelemetry.io/collector/confmap v0.106.1
go.opentelemetry.io/collector/internal/globalgates v0.106.1
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
Expand Down
1 change: 0 additions & 1 deletion confmap/internal/e2e/expand_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ func Test_EscapedEnvVars_NoDefaultScheme(t *testing.T) {
assert.Equal(t, expectedMap, m)
}

// Test_EscapedEnvVars tests that the resolver supports escaped env vars working together with expand converter.
func Test_EscapedEnvVars_DefaultScheme(t *testing.T) {
const expandedValue = "some expanded value"
t.Setenv("ENV_VALUE", expandedValue)
Expand Down

0 comments on commit fd8ca4b

Please sign in to comment.