gregandClaude Opus 5.5
fe790ad223
CI's boot test gave every blank password-like setting a throwaway value. A real deploy only fills x-generate fields, so a template whose server won't start without one passed CI and failed for the first owner who deployed it. boottest-payload now fills only x-generate fields, for CI and the builder alike. The old behaviour is kept as -fill-blank-passwords, used only by the builder's second boot to tell whether an empty setting is why a draft fails. Messages and AUTHORING.md no longer say boot tests fill passwords; a server that needs a join password gets x-generate. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
82 lines
2.5 KiB
Go
82 lines
2.5 KiB
Go
package main
|
|
|
|
import (
|
|
"encoding/json"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func TestBootTestPayloadIsWhatANewServerGets(t *testing.T) {
|
|
dir := t.TempDir()
|
|
game := filepath.Join(dir, "games", "demo")
|
|
if err := os.MkdirAll(game, 0o755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
os.WriteFile(filepath.Join(game, "game.yaml"), []byte(`id: demo
|
|
name: Demo
|
|
defaultDockerImage: debian:12
|
|
installMethod: NONE
|
|
defaultConfig:
|
|
RCON_PORT: 25575
|
|
ENABLE_RCON: true
|
|
RCON_PASSWORD: ""
|
|
ServerPassword: ""
|
|
AdminPassword: kept-by-owner
|
|
MOTD: "{SERVER_NAME} on {PUBLIC_PORT_25565}"
|
|
configSchema:
|
|
properties:
|
|
RCON_PORT: {type: integer}
|
|
ENABLE_RCON: {type: boolean}
|
|
RCON_PASSWORD: {type: string, x-generate: {type: password}}
|
|
ServerPassword: {type: string}
|
|
AdminPassword: {type: string}
|
|
MOTD: {type: string}
|
|
`), 0o644)
|
|
|
|
out := filepath.Join(dir, "payload.json")
|
|
if err := runBootTestPayload([]string{"-games", filepath.Join(dir, "games"), "-out", out, "demo"}); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
raw, _ := os.ReadFile(out)
|
|
var payload struct{ GameConfig map[string]any }
|
|
if err := json.Unmarshal(raw, &payload); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
c := payload.GameConfig
|
|
|
|
if c["RCON_PORT"] != float64(25575) {
|
|
t.Errorf("RCON_PORT changed to %v", c["RCON_PORT"])
|
|
}
|
|
if c["ENABLE_RCON"] != true {
|
|
t.Errorf("ENABLE_RCON changed to %v", c["ENABLE_RCON"])
|
|
}
|
|
// Exactly what a new server gets: the x-generate password is made, a blank join password stays blank
|
|
if s, _ := c["RCON_PASSWORD"].(string); !strings.HasPrefix(s, "boot-") {
|
|
t.Errorf("x-generate RCON_PASSWORD not filled: %v", c["RCON_PASSWORD"])
|
|
}
|
|
if c["ServerPassword"] != "" {
|
|
t.Errorf("ServerPassword must stay empty, as for a new server: %v", c["ServerPassword"])
|
|
}
|
|
if c["AdminPassword"] != "kept-by-owner" {
|
|
t.Errorf("AdminPassword overwritten: %v", c["AdminPassword"])
|
|
}
|
|
if c["MOTD"] != "gbr-boot-test on 25565" {
|
|
t.Errorf("placeholders not resolved: %v", c["MOTD"])
|
|
}
|
|
|
|
// Only for the builder's diagnosis: blank passwords filled too
|
|
if err := runBootTestPayload([]string{"-fill-blank-passwords", "-games", filepath.Join(dir, "games"), "-out", out, "demo"}); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
raw, _ = os.ReadFile(out)
|
|
payload.GameConfig = nil
|
|
if err := json.Unmarshal(raw, &payload); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if s, _ := payload.GameConfig["ServerPassword"].(string); !strings.HasPrefix(s, "boot-") {
|
|
t.Errorf("-fill-blank-passwords: ServerPassword not filled: %v", payload.GameConfig["ServerPassword"])
|
|
}
|
|
}
|