feat(apply): per-record selection + deletes-before-updates ordering
RecordDiff.Key() gives a stable normalized identifier ("TYPE name.") for
every diff kind, exposed as recordView.Key. ApplyRequest now takes
Updates/Prunes key lists instead of two booleans, so callers can apply a
subset of records. service.Apply builds the applied set with selected
prunes (Delete) added before selected updates (Add/Update) — an
invariant, not an option — since the provider rejects an Add/Update
whose name still conflicts with an existing record (e.g. a CNAME cannot
be created while an A on the same name still exists).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BwxdSt4reTm7Dj1oxRvpP3
This commit is contained in:
@@ -84,12 +84,15 @@ func TestCheckEndpoint(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestApplyDefaultsPruneFalse(t *testing.T) {
|
||||
// TestApplySendsSelectedKeys covers the per-record selection request shape:
|
||||
// POST /apply with only "prunes" set must reach the service with that key in
|
||||
// Prunes and an empty Updates.
|
||||
func TestApplySendsSelectedKeys(t *testing.T) {
|
||||
a, m := newTestAPI()
|
||||
router := NewRouter(a)
|
||||
|
||||
did := uuid.New().String()
|
||||
body := `{"applyUpdates":true}` // applyPrunes отсутствует → false
|
||||
body := `{"prunes":["A gitlocator.com."]}`
|
||||
req := requestWithSessionCookie(http.MethodPost,
|
||||
"/api/v1/projects/00000000-0000-0000-0000-000000000002/domains/"+did+"/apply",
|
||||
strings.NewReader(body))
|
||||
@@ -99,7 +102,7 @@ func TestApplyDefaultsPruneFalse(t *testing.T) {
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("status %d body %s", w.Code, w.Body.String())
|
||||
}
|
||||
if m.lastReq.ApplyPrunes != false || m.lastReq.ApplyUpdates != true {
|
||||
if len(m.lastReq.Prunes) != 1 || m.lastReq.Prunes[0] != "A gitlocator.com." || len(m.lastReq.Updates) != 0 {
|
||||
t.Fatalf("apply request mismatch: %+v", m.lastReq)
|
||||
}
|
||||
}
|
||||
@@ -117,8 +120,8 @@ func TestApplyEmptyBodyOK(t *testing.T) {
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("status %d body %s", w.Code, w.Body.String())
|
||||
}
|
||||
if m.lastReq.ApplyPrunes != false {
|
||||
t.Fatalf("expected ApplyPrunes=false for empty body, got %+v", m.lastReq)
|
||||
if len(m.lastReq.Updates) != 0 || len(m.lastReq.Prunes) != 0 {
|
||||
t.Fatalf("expected empty Updates/Prunes for empty body, got %+v", m.lastReq)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,7 +130,7 @@ func TestApplyMalformedBody(t *testing.T) {
|
||||
router := NewRouter(a)
|
||||
|
||||
did := uuid.New().String()
|
||||
body := `{"applyUpdates":`
|
||||
body := `{"updates":`
|
||||
req := requestWithSessionCookie(http.MethodPost,
|
||||
"/api/v1/projects/00000000-0000-0000-0000-000000000002/domains/"+did+"/apply",
|
||||
strings.NewReader(body))
|
||||
|
||||
+4
-3
@@ -40,11 +40,12 @@ func toAuthResponse(u store.User, p store.Project) authResponse {
|
||||
}
|
||||
|
||||
type applyRequest struct {
|
||||
ApplyUpdates bool `json:"applyUpdates"`
|
||||
ApplyPrunes bool `json:"applyPrunes"`
|
||||
Updates []string `json:"updates"`
|
||||
Prunes []string `json:"prunes"`
|
||||
}
|
||||
|
||||
type recordView struct {
|
||||
Key string `json:"key"`
|
||||
Kind string `json:"kind"`
|
||||
Type string `json:"type"`
|
||||
Name string `json:"name"`
|
||||
@@ -61,7 +62,7 @@ type changesetResponse struct {
|
||||
}
|
||||
|
||||
func toRecordView(d diff.RecordDiff) recordView {
|
||||
rv := recordView{Kind: string(d.Kind), Type: string(d.Type), Name: d.Name, ReadOnly: d.ReadOnly}
|
||||
rv := recordView{Key: d.Key(), Kind: string(d.Kind), Type: string(d.Type), Name: d.Name, ReadOnly: d.ReadOnly}
|
||||
if d.Desired != nil {
|
||||
rv.Desired = d.Desired.Values
|
||||
}
|
||||
|
||||
@@ -66,15 +66,16 @@ func (a *API) handleApply(w http.ResponseWriter, r *http.Request) {
|
||||
var req applyRequest
|
||||
if r.Body != nil {
|
||||
r.Body = http.MaxBytesReader(w, r.Body, 1<<20) // 1 MiB
|
||||
// пустое тело допустимо → значения по умолчанию (prune=false);
|
||||
// любая другая ошибка decode (битый JSON, неверные типы) → 400
|
||||
// пустое тело допустимо → значения по умолчанию (пустые списки, ничего
|
||||
// не применяется); любая другая ошибка decode (битый JSON, неверные
|
||||
// типы) → 400
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil && !errors.Is(err, io.EOF) {
|
||||
writeErr(w, http.StatusBadRequest, "invalid request body")
|
||||
return
|
||||
}
|
||||
}
|
||||
cs, err := a.Svc.Apply(r.Context(), pid, did, service.ApplyRequest{
|
||||
ApplyUpdates: req.ApplyUpdates, ApplyPrunes: req.ApplyPrunes,
|
||||
Updates: req.Updates, Prunes: req.Prunes,
|
||||
})
|
||||
if err != nil {
|
||||
log.Printf("api: apply failed: %v", err)
|
||||
|
||||
Reference in New Issue
Block a user