From 45dc19368a8e122f3765f9cf8d4efb4992c33865 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 2 Feb 2022 14:46:59 -0500
Subject: [PATCH] add CONFLICT result to recovery endpoint

---
 src/_zkapauthorizer/backup-recovery.yaml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/_zkapauthorizer/backup-recovery.yaml b/src/_zkapauthorizer/backup-recovery.yaml
index 9aee774..1d13d9e 100644
--- a/src/_zkapauthorizer/backup-recovery.yaml
+++ b/src/_zkapauthorizer/backup-recovery.yaml
@@ -34,7 +34,13 @@ paths:
               schema:
                 $ref: "#/components/schemas/Error"
 
-        "404":
+        "409": # CONFLICT
+          description: >-
+            Recovery is not possible at this time because local state already
+            exists in the database.  Recover into a new, empty ZKAPAuthorizer
+            installation only.
+
+        "404": # NOT FOUND
           description: >-
             Recovery from the replica has failed because the recovery data
             cannot be retrieved using the given capability.
-- 
GitLab