Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,16 @@ type Config struct {
AccessToken string `json:"access-token,omitempty" yaml:"access-token,omitempty"`
AnalyticsOptOut *bool `json:"analytics-opt-out,omitempty" yaml:"analytics-opt-out,omitempty"`
BaseURI string `json:"base-uri,omitempty" yaml:"base-uri,omitempty"`
CorsEnabled *bool `json:"cors-enabled,omitempty" yaml:"cors-enabled,omitempty"`
CorsOrigin string `json:"cors-origin,omitempty" yaml:"cors-origin,omitempty"`
DevStreamURI string `json:"dev-stream-uri,omitempty" yaml:"dev-stream-uri,omitempty"`
Environment string `json:"environment,omitempty" yaml:"environment,omitempty"`
Flag string `json:"flag,omitempty" yaml:"flag,omitempty"`
Host string `json:"host,omitempty" yaml:"host,omitempty"`
Output string `json:"output,omitempty" yaml:"output,omitempty"`
Port string `json:"port,omitempty" yaml:"port,omitempty"`
Project string `json:"project,omitempty" yaml:"project,omitempty"`
SyncOnce *bool `json:"sync-once,omitempty" yaml:"sync-once,omitempty"`
UpdateCheckOptOut *bool `json:"update-check-opt-out,omitempty" yaml:"update-check-opt-out,omitempty"`
}

Expand Down Expand Up @@ -119,6 +123,22 @@ func (c Config) Update(kvs []string) (Config, []string, error) {
c.AnalyticsOptOut = &val
case cliflags.BaseURIFlag:
c.BaseURI = v
case cliflags.CorsEnabledFlag:
val, err := strconv.ParseBool(v)
if err != nil {
return Config{}, nil, errors.NewError("cors-enabled must be true or false")
}
c.CorsEnabled = &val
case cliflags.CorsOriginFlag:
c.CorsOrigin = v
case cliflags.PortFlag:
c.Port = v
case cliflags.SyncOnceFlag:
val, err := strconv.ParseBool(v)
if err != nil {
return Config{}, nil, errors.NewError("sync-once must be true or false")
}
c.SyncOnce = &val
case cliflags.DevStreamURIFlag:
c.DevStreamURI = v
case cliflags.EnvironmentFlag:
Expand Down
46 changes: 46 additions & 0 deletions internal/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -254,3 +254,49 @@ func TestErrorDoesNotEchoNonKeyArguments(t *testing.T) {
assert.NotContains(t, err.Error(), token)
})
}

func TestDevServerConfigurationRoundTrip(t *testing.T) {
for _, enabled := range []string{"true", "false"} {
t.Run(enabled, func(t *testing.T) {
values := map[string]string{
"port": "9876",
"cors-enabled": enabled,
"cors-origin": "http://localhost:3000",
"sync-once": enabled,
}
c := config.Config{}
for key, value := range values {
var err error
var fields []string
c, fields, err = c.Update([]string{key, value})
require.NoError(t, err)
assert.Equal(t, []string{key}, fields)
}
data, err := yaml.Marshal(c)
require.NoError(t, err)
c, err = config.New("test", mockReadFile{contents: data}.readFile)
require.NoError(t, err)
c, _, err = c.Update([]string{"project", "test-project"})
require.NoError(t, err)
for _, marshal := range []func(interface{}) ([]byte, error){yaml.Marshal, json.Marshal} {
data, err := marshal(c)
require.NoError(t, err)
actual := map[string]interface{}{}
require.NoError(t, yaml.Unmarshal(data, &actual))
assert.Equal(t, "9876", actual["port"])
assert.Equal(t, enabled == "true", actual["cors-enabled"])
assert.Equal(t, "http://localhost:3000", actual["cors-origin"])
assert.Equal(t, enabled == "true", actual["sync-once"])
}
})
}
}

func TestDevServerConfigurationRejectsInvalidBooleans(t *testing.T) {
for _, key := range []string{"cors-enabled", "sync-once"} {
t.Run(key, func(t *testing.T) {
_, _, err := config.Config{}.Update([]string{key, "invalid"})
assert.EqualError(t, err, key+" must be true or false")
})
}
}
Loading