Skip to content

Commit 0d53ff2

Browse files
authored
fix env expand (#2394)
1 parent de1daee commit 0d53ff2

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

probe/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type Config struct {
1616
FleetManagerEndpoint string `env:"FLEET_MANAGER_ENDPOINT" envDefault:"http://127.0.0.1:8000"`
1717
MetricsAddress string `env:"METRICS_ADDRESS" envDefault:":7070"`
1818
RHSSOClientID string `env:"RHSSO_SERVICE_ACCOUNT_CLIENT_ID"`
19-
ProbeName string `env:"PROBE_NAME" envDefault:"${HOSTNAME}" envExpand:"true"`
19+
ProbeName string `env:"PROBE_NAME,expand" envDefault:"${HOSTNAME}"`
2020
ProbeHTTPRequestTimeout time.Duration `env:"PROBE_HTTP_REQUEST_TIMEOUT" envDefault:"5s"`
2121
ProbePollPeriod time.Duration `env:"PROBE_POLL_PERIOD" envDefault:"5s"`
2222
ProbeRunTimeout time.Duration `env:"PROBE_RUN_TIMEOUT" envDefault:"35m"`

probe/config/config_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ func TestGetConfig_Success(t *testing.T) {
1313
t.Setenv("AUTH_TYPE", "RHSSO")
1414
t.Setenv("RHSSO_SERVICE_ACCOUNT_CLIENT_ID", "dummy")
1515
t.Setenv("RHSSO_SERVICE_ACCOUNT_CLIENT_SECRET", "dummy")
16+
t.Setenv("HOSTNAME", "hostname-dummy")
1617

1718
cfg, err := GetConfig()
1819

1920
require.NoError(t, err)
2021
assert.Equal(t, cfg.FleetManagerEndpoint, "http://127.0.0.1:8888")
2122
assert.Equal(t, cfg.ProbePollPeriod, 5*time.Second)
23+
assert.Equal(t, cfg.ProbeName, "hostname-dummy")
2224
}
2325

2426
func TestGetConfig_Failure(t *testing.T) {

0 commit comments

Comments
 (0)