mirror of
https://github.com/rcourtman/Pulse.git
synced 2026-10-15 16:42:15 +00:00
rcourtman
93c62e691a
Six small refactors aggregated from a simplify-review pass over this session's commits: 1. internal/config/persistence_relay.go — LoadRelayConfig had two ApplyEnvOverrides call sites (one inside the not-exist branch, one on the happy path) and a redundant cfg = DefaultConfig() reassignment. Collapse to a single ApplyEnvOverrides call after the load attempt; the file-absent branch already has the default cfg from line 1. 2. internal/relay/config_env.go — swap two strings.TrimSpace(os.Getenv(...)) calls for utils.GetenvTrim, matching the 30+ existing call sites in internal/config/config.go. Trim narrating comments back to the product-behavior sentences that aren't obvious from the code. 3. internal/relay/config_env_test.go — collapse seven near-identical ApplyEnvOverrides scenarios into a single table-driven test (TestApplyEnvOverridesTable). Reduces ~85 lines to ~60 and gives each subcase a named t.Run for clearer failure output. Keeps the nil-config-safe and parseEnvBool tests separate since they exercise different surfaces. 4. .github/workflows/install-sh-smoke.yml — replace the /api/health bash for-loop (sleep 2; curl; loop 30x) with a single curl --retry 30 --retry-delay 2 --retry-connrefused --retry-all-errors invocation. Curl already implements the same polling behaviour natively; the bash loop was 13 lines of redundant scaffolding. 5. scripts/installtests/build_release_assets_test.go — extract the repeated "read file, iterate required substrings, fail on first miss" boilerplate into assertFileContainsAll(t, path, required...). Migrate the four tests I added in this session; existing tests in the file follow the same shape and can adopt the helper incrementally without churning unrelated code in this commit. Also updated the pinned curl string for the /api/health retry change. Contract-neutral: every change preserves identical user-visible behavior. PULSE_ALLOW_CONTRACT_NEUTRAL_COMMIT applied for the canonical-shape-guard bypass; sensitivity, gitleaks, governance-stage, control-plane, status, registry, contract, and pre-commit hooks still run. Verified locally: - go test ./internal/relay/ ./internal/config/ → all pass - go test ./scripts/installtests/ → all pass - ruby -ryaml install-sh-smoke.yml → parses clean
36 lines
1.1 KiB
Go
36 lines
1.1 KiB
Go
package config
|
|
|
|
import (
|
|
"errors"
|
|
"io/fs"
|
|
"os"
|
|
|
|
"github.com/rcourtman/pulse-go-rewrite/internal/relay"
|
|
"github.com/rs/zerolog/log"
|
|
)
|
|
|
|
// SaveRelayConfig stores relay settings, encrypting when a crypto manager is available.
|
|
func (c *ConfigPersistence) SaveRelayConfig(cfg relay.Config) error {
|
|
if err := saveJSON(c, c.relayFile, cfg, true); err != nil {
|
|
return err
|
|
}
|
|
|
|
log.Info().Str("file", c.relayFile).Bool("enabled", cfg.Enabled).Msg("Relay configuration saved")
|
|
return nil
|
|
}
|
|
|
|
// LoadRelayConfig retrieves the persisted relay settings. Returns default config if none exists.
|
|
// PULSE_RELAY_ENABLED / PULSE_RELAY_SERVER env vars override the file values
|
|
// after load — see relay.ApplyEnvOverrides for the precedence rules.
|
|
func (c *ConfigPersistence) LoadRelayConfig() (*relay.Config, error) {
|
|
cfg := relay.DefaultConfig()
|
|
if err := loadJSON(c, c.relayFile, true, cfg); err != nil {
|
|
if !errors.Is(err, fs.ErrNotExist) && !os.IsNotExist(err) {
|
|
return nil, err
|
|
}
|
|
// File absent: cfg is already the default; fall through to env overrides.
|
|
}
|
|
relay.ApplyEnvOverrides(cfg)
|
|
return cfg, nil
|
|
}
|