config: add support for float64
This commit is contained in:
@@ -31,9 +31,9 @@ func dropinContents(e interface{}) string {
|
||||
|
||||
var out string
|
||||
for i := 0; i < et.NumField(); i++ {
|
||||
if val := ev.Field(i).String(); val != "" {
|
||||
if val := ev.Field(i).Interface(); !config.IsZero(val) {
|
||||
key := et.Field(i).Tag.Get("env")
|
||||
out += fmt.Sprintf("Environment=\"%s=%s\"\n", key, val)
|
||||
out += fmt.Sprintf("Environment=\"%s=%v\"\n", key, val)
|
||||
}
|
||||
}
|
||||
|
||||
|
55
system/env_test.go
Normal file
55
system/env_test.go
Normal file
@@ -0,0 +1,55 @@
|
||||
package system
|
||||
|
||||
import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestDropinContents(t *testing.T) {
|
||||
tests := []struct {
|
||||
Config interface{}
|
||||
Contents string
|
||||
}{
|
||||
{
|
||||
struct{}{},
|
||||
"",
|
||||
},
|
||||
{
|
||||
struct {
|
||||
A string `env:"A"`
|
||||
B int `env:"B"`
|
||||
C bool `env:"C"`
|
||||
D float64 `env:"D"`
|
||||
}{
|
||||
"hi", 1, true, 0.12345,
|
||||
},
|
||||
`[Service]
|
||||
Environment="A=hi"
|
||||
Environment="B=1"
|
||||
Environment="C=true"
|
||||
Environment="D=0.12345"
|
||||
`,
|
||||
},
|
||||
{
|
||||
struct {
|
||||
A float64 `env:"A"`
|
||||
B float64 `env:"B"`
|
||||
C float64 `env:"C"`
|
||||
D float64 `env:"D"`
|
||||
}{
|
||||
0.000001, 1, 0.9999999, 0.1,
|
||||
},
|
||||
`[Service]
|
||||
Environment="A=1e-06"
|
||||
Environment="B=1"
|
||||
Environment="C=0.9999999"
|
||||
Environment="D=0.1"
|
||||
`,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
if c := dropinContents(tt.Config); c != tt.Contents {
|
||||
t.Errorf("bad contents (%+v): want %q, got %q", tt, tt.Contents, c)
|
||||
}
|
||||
}
|
||||
}
|
@@ -67,7 +67,7 @@ Environment="ETCD_PEER_BIND_ADDR=127.0.0.1:7002"
|
||||
} {
|
||||
units := Etcd{tt.config}.Units()
|
||||
if !reflect.DeepEqual(tt.units, units) {
|
||||
t.Errorf("bad units (%q): want %#v, got %#v", tt.config, tt.units, units)
|
||||
t.Errorf("bad units (%+v): want %#v, got %#v", tt.config, tt.units, units)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -48,7 +48,7 @@ Environment="FLEET_PUBLIC_IP=12.34.56.78"
|
||||
} {
|
||||
units := Fleet{tt.config}.Units()
|
||||
if !reflect.DeepEqual(units, tt.units) {
|
||||
t.Errorf("bad units (%q): want %#v, got %#v", tt.config, tt.units, units)
|
||||
t.Errorf("bad units (%+v): want %#v, got %#v", tt.config, tt.units, units)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user