Remove configurable state path

Author: Sunser

.github/workflows/docker-image.yml

@@ -26,6 +26,9 @@ jobs:
         shell: bash
         run: echo "IMAGE_NAME=ghcr.io/${GITHUB_REPOSITORY,,}" >> "$GITHUB_ENV"
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 

Dockerfile

@@ -6,7 +6,6 @@ ARG TARGETARCH
 ARG TARGETVARIANT
 
 WORKDIR /src
-RUN apk add --no-cache ca-certificates tzdata
 
 COPY go.mod ./
 COPY cmd ./cmd
@@ -25,9 +24,9 @@ RUN set -eux; \
 
 FROM alpine:3.20
 
+RUN apk add --no-cache ca-certificates tzdata
+
 WORKDIR /app
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
-COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
 COPY --from=builder /out/ecs-controller ./ecs-controller
 COPY web ./web
 

cmd/ecs-controller/main.go

@@ -17,6 +17,7 @@ import (
 
 const (
 	configPath = "/data/settings.yaml"
+	statePath  = "/data/state.json"
 	webDir     = "/app/web"
 )
 
@@ -31,9 +32,9 @@ func main() {
 	}
 	applog.SetLevel(cfg.Logging.Level)
 
-	state, err := monitor.OpenStateStore(cfg.Server.StatePath)
+	state, err := monitor.OpenStateStore(statePath)
 	if err != nil {
-		applog.Error("state", "load failed", map[string]string{"path": cfg.Server.StatePath, "error": err.Error()})
+		applog.Error("state", "load failed", map[string]string{"path": statePath, "error": err.Error()})
 		os.Exit(1)
 	}
 

internal/config/config.go

@@ -29,7 +29,6 @@ type ServerConfig struct {
 	RefreshInterval time.Duration
 	RequestTimeout  time.Duration
 	Password        string
-	StatePath       string
 }
 
 type DiscoveryConfig struct {
@@ -203,7 +202,6 @@ func defaultConfig() Config {
 			Listen:          ":8080",
 			RefreshInterval: 5 * time.Minute,
 			RequestTimeout:  20 * time.Second,
-			StatePath:       "/data/state.json",
 		},
 		Discovery: DiscoveryConfig{
 			RegionRefreshInterval: 24 * time.Hour,
@@ -242,8 +240,6 @@ func applyServer(cfg *ServerConfig, key, value string) error {
 		cfg.RequestTimeout = duration
 	case "password":
 		cfg.Password = scalar(value)
-	case "state_path":
-		cfg.StatePath = scalar(value)
 	default:
 		return fmt.Errorf("未知 server 字段 %q", key)
 	}

internal/config/config_test.go

@@ -45,9 +45,6 @@ accounts:
 	if cfg.Server.RefreshInterval != 5*time.Minute {
 		t.Fatalf("refresh interval = %s, want 5m", cfg.Server.RefreshInterval)
 	}
-	if cfg.Server.StatePath != "/data/state.json" {
-		t.Fatalf("state path = %q, want /data/state.json", cfg.Server.StatePath)
-	}
 	if cfg.KeepAlive.TrafficPolicy != "manual_only_when_exceeded" {
 		t.Fatalf("traffic policy = %q", cfg.KeepAlive.TrafficPolicy)
 	}
@@ -89,6 +86,25 @@ accounts:
 	}
 }
 
+func TestLoadBytesRejectsLegacyStatePath(t *testing.T) {
+	_, err := config.LoadBytes([]byte(`
+server:
+  password: "secret"
+  state_path: "/data/state.json"
+accounts:
+  - name: "cn"
+    site: "china"
+    access_key_id: "ak"
+    access_key_secret: "sk"
+`))
+	if err == nil {
+		t.Fatal("LoadBytes() error = nil, want unknown state_path error")
+	}
+	if !strings.Contains(err.Error(), "state_path") {
+		t.Fatalf("LoadBytes() error = %v, want state_path", err)
+	}
+}
+
 func TestLoadBytesRejectsMissingAccounts(t *testing.T) {
 	_, err := config.LoadBytes([]byte(`
 server:

internal/config/write.go

@@ -45,7 +45,6 @@ func renderGlobalSettings(original string, cfg Config) string {
 	writeKeyValue(&builder, "refresh_interval", quote(formatDuration(cfg.Server.RefreshInterval.String())))
 	writeKeyValue(&builder, "request_timeout", quote(formatDuration(cfg.Server.RequestTimeout.String())))
 	writeKeyValue(&builder, "password", rawOrEnvPlaceholder(original, "server", "password", "EC_PASSWORD", cfg.Server.Password))
-	writeKeyValue(&builder, "state_path", rawOrQuoted(original, "server", "state_path", cfg.Server.StatePath))
 
 	builder.WriteString("\ndiscovery:\n")
 	writeKeyValue(&builder, "region_refresh_interval", quote(formatDuration(cfg.Discovery.RegionRefreshInterval.String())))

internal/config/write_test.go

@@ -22,7 +22,6 @@ server:
   refresh_interval: "5m"
   request_timeout: "20s"
   password: "${EC_PASSWORD}"
-  state_path: "/data/state.json"
 
 discovery:
   region_refresh_interval: "24h"
@@ -105,6 +104,9 @@ accounts:
 	if strings.Contains(text, "instance_refresh_interval") {
 		t.Fatalf("written config kept legacy instance_refresh_interval:\n%s", text)
 	}
+	if strings.Contains(text, "state_path") {
+		t.Fatalf("written config kept legacy state_path:\n%s", text)
+	}
 
 	reloaded, err := config.LoadFile(path)
 	if err != nil {

internal/monitor/service_test.go

@@ -141,7 +141,6 @@ server:
   refresh_interval: "5m"
   request_timeout: "20s"
   password: "${EC_PASSWORD}"
-  state_path: "/data/state.json"
 
 discovery:
   region_refresh_interval: "24h"