Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[confmap] Support expansion for environment variables with time formats #11241

Merged
merged 10 commits into from
Sep 27, 2024
Merged

[confmap] Support expansion for environment variables with time formats #11241

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9c30c53
Remove explicit check
irisgve Sep 23, 2024
a1279ef
Add test case
irisgve Sep 23, 2024
ed88f37
Change test case name
irisgve Sep 23, 2024
a8790f9
Add e2e test case
irisgve Sep 23, 2024
0d37885
Add changelog
irisgve Sep 23, 2024
d12a7b4
Add more test case
irisgve Sep 23, 2024
dd97ee8
Remove tests for expecting errors on unsupported types
irisgve Sep 23, 2024
0b2af62
Add back check and add time.Time as type
irisgve Sep 23, 2024
f756d4f
Merge branch 'main' into support-time-envvar-expansion
irisgve Sep 23, 2024
b75ab86
Merge branch 'main' into support-time-envvar-expansion
irisgve Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions confmap/expand_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@ func TestResolverExpandStringValues(t *testing.T) {
input: "test_${env:BOOL}",
output: "test_true",
},
{
name: "Bool",
irisgve marked this conversation as resolved.
Show resolved Hide resolved
input: "test_${env:TIMESTAMP}",
output: "test_2023-03-20T03:17:55.432328Z",
},
{
name: "MultipleSameMatches",
input: "test_${env:BOOL}_test_${env:BOOL}",
Expand Down Expand Up @@ -414,6 +419,8 @@ func newEnvProvider() ProviderFactory {
return NewRetrievedFromYAML([]byte("[localhost:3042]"))
case "env:HOST":
return NewRetrievedFromYAML([]byte("localhost"))
case "env:TIMESTAMP":
return NewRetrievedFromYAML([]byte("2023-03-20T03:17:55.432328Z"))
case "env:OS":
return NewRetrievedFromYAML([]byte("ubuntu"))
case "env:PR":
Expand Down
17 changes: 0 additions & 17 deletions confmap/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,6 @@ func NewRetrievedFromYAML(yamlBytes []byte, opts ...RetrievedOption) (*Retrieved
// - []any;
// - map[string]any;
func NewRetrieved(rawConf any, opts ...RetrievedOption) (*Retrieved, error) {
if err := checkRawConfType(rawConf); err != nil {
TylerHelmuth marked this conversation as resolved.
Show resolved Hide resolved
return nil, err
}
set := retrievedSettings{}
for _, opt := range opts {
opt.apply(&set)
Expand Down Expand Up @@ -229,17 +226,3 @@ func (r *Retrieved) Close(ctx context.Context) error {

// CloseFunc a function equivalent to Retrieved.Close.
type CloseFunc func(context.Context) error

func checkRawConfType(rawConf any) error {
if rawConf == nil {
return nil
}
switch rawConf.(type) {
case int, int32, int64, float32, float64, bool, string, []any, map[string]any:
return nil
default:
return fmt.Errorf(
"unsupported type=%T for retrieved config,"+
" ensure that values are wrapped in quotes", rawConf)
}
}
5 changes: 5 additions & 0 deletions confmap/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"context"
"errors"
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -103,6 +104,10 @@ func TestNewRetrievedFromYAMLString(t *testing.T) {
yaml: "123",
value: 123,
},
{
yaml: "2023-03-20T03:17:55.432328Z",
value: time.Date(2023, 3, 20, 3, 17, 55, 432328000, time.UTC),
},
{
yaml: "true",
value: true,
Expand Down