From 46f04aafb65ea18db69a311af7254a67966d4fb3 Mon Sep 17 00:00:00 2001 From: Alex Castillo Date: Mon, 16 Nov 2026 12:12:19 -0400 Subject: [PATCH] fix(config): persist dev server configuration --- internal/config/config.go | 20 +++++++++++++++ internal/config/config_test.go | 46 ++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/internal/config/config.go b/internal/config/config.go index 2c5911fb8..ff65c0de5 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -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"` } @@ -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: diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 2b5d8272b..3eb7846a9 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -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") + }) + } +}