Skip to content
Merged
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
6 changes: 6 additions & 0 deletions internal/flyetcd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ var (
const (
MetricsBaseURL = "http://[::]:2381"
MetricsEndpoint = "http://[::]:2381/metrics"

minBcryptCost = 4
maxBcryptCost = 31
defaultBcryptCost = 10
)

// Example configuration file: https://github.com/etcd-io/etcd/blob/release-3.5/etcd.conf.yml.sample
Expand All @@ -38,6 +42,7 @@ type Config struct {
AutoCompactionMode string `yaml:"auto-compaction-mode"`
AutoCompactionRetention string `yaml:"auto-compaction-retention"`
AuthToken string `yaml:"auth-token"`
BcryptCost int `yaml:"bcrypt-cost"`

MaxSnapshots int `yaml:"max-snapshots"`
MaxWals int `yaml:"max-wals"`
Expand Down Expand Up @@ -67,6 +72,7 @@ func DefaultConfig() *Config {
AutoCompactionMode: "periodic",
AutoCompactionRetention: "1",
AuthToken: "",
BcryptCost: defaultBcryptCost,
MaxSnapshots: 10,
MaxWals: 10,
SnapshotCount: 10000, // Default
Expand Down
44 changes: 44 additions & 0 deletions internal/flyetcd/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,10 @@ func TestResolveConfig(t *testing.T) {
if cfg.AutoCompactionMode != "periodic" {
t.Errorf("expected auto-compaction-mode 'periodic', got %q", cfg.AutoCompactionMode)
}

if cfg.BcryptCost != defaultBcryptCost {
t.Errorf("expected bcrypt-cost %d, got %d", defaultBcryptCost, cfg.BcryptCost)
}
})

t.Run("env overrides", func(t *testing.T) {
Expand All @@ -181,6 +185,7 @@ func TestResolveConfig(t *testing.T) {
t.Setenv("ETCD_MAX_SNAPSHOTS", "20")
t.Setenv("ETCD_AUTO_COMPACTION_MODE", "revision")
t.Setenv("ETCD_AUTO_COMPACTION_RETENTION", "1000")
t.Setenv("ETCD_BCRYPT_COST", "4")

cfg, err := resolveConfig()
if err != nil {
Expand All @@ -204,11 +209,29 @@ func TestResolveConfig(t *testing.T) {
t.Errorf("expected auto-compaction-retention '1000', got %q", cfg.AutoCompactionRetention)
}

if cfg.BcryptCost != 4 {
t.Errorf("expected bcrypt-cost 4, got %d", cfg.BcryptCost)
}

// Unset env vars should keep defaults.
if cfg.MaxWals != 10 {
t.Errorf("expected max-wals 10, got %d", cfg.MaxWals)
}
})

t.Run("bcrypt cost out of range falls back to default", func(t *testing.T) {
setupTestDirs(t)
t.Setenv("ETCD_BCRYPT_COST", "99")

cfg, err := resolveConfig()
if err != nil {
t.Fatalf("resolveConfig failed: %v", err)
}

if cfg.BcryptCost != defaultBcryptCost {
t.Errorf("expected bcrypt-cost %d, got %d", defaultBcryptCost, cfg.BcryptCost)
}
})
})

t.Run("config file", func(t *testing.T) {
Expand Down Expand Up @@ -348,6 +371,27 @@ max-snapshots: 5
}
})

t.Run("bcrypt cost from config file preserved", func(t *testing.T) {
tmpDir := setupTestDirs(t)

configYAML := []byte(`
name: existing-node
bcrypt-cost: 6
`)
if err := os.WriteFile(filepath.Join(tmpDir, "etcd.yaml"), configYAML, 0644); err != nil {
t.Fatalf("failed to write config: %v", err)
}

cfg, err := resolveConfig()
if err != nil {
t.Fatalf("resolveConfig failed: %v", err)
}

if cfg.BcryptCost != 6 {
t.Errorf("expected bcrypt-cost 6, got %d", cfg.BcryptCost)
}
})

t.Run("dynamic settings always forced", func(t *testing.T) {
tmpDir := setupTestDirs(t)

Expand Down
8 changes: 8 additions & 0 deletions internal/flyetcd/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package flyetcd
import (
"context"
"fmt"
"log"
"os"
"strings"
"time"
Expand Down Expand Up @@ -103,6 +104,13 @@ func resolveConfig() (*Config, error) {
cfg.AutoCompactionRetention = getEnvOrDefault("ETCD_AUTO_COMPACTION_RETENTION", cfg.AutoCompactionRetention)
cfg.AdvertiseClientUrls = getEnvOrDefault("ETCD_ADVERTISE_CLIENT_URLS", cfg.AdvertiseClientUrls)

cfg.BcryptCost = getEnvOrDefault("ETCD_BCRYPT_COST", cfg.BcryptCost)
if cfg.BcryptCost < minBcryptCost || cfg.BcryptCost > maxBcryptCost {
log.Printf("bcrypt-cost %d outside [%d, %d], using default %d",
cfg.BcryptCost, minBcryptCost, maxBcryptCost, defaultBcryptCost)
cfg.BcryptCost = defaultBcryptCost
}

if err := cfg.SetAuthToken(); err != nil {
return nil, fmt.Errorf("failed to set auth token: %w", err)
}
Expand Down
Loading